From 32860d0c226821b3792a08d2b973a22c12984b59 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 20 Apr 2012 06:08:26 +1000 Subject: [PATCH 01/39] Update hr.po to the latest version available from TP --- po/hr.po | 110 +++++++++++++++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/po/hr.po b/po/hr.po index 6a9ee22..a9f99de 100644 --- a/po/hr.po +++ b/po/hr.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.4-pre2\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-04-14 14:31+1000\n" -"PO-Revision-Date: 2012-04-18 18:36+0200\n" +"PO-Revision-Date: 2012-04-19 09:21+1000\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" "Language: hr\n" @@ -1079,7 +1079,7 @@ msgstr[2] "Možete prodati ^{%'ld^} dionica." #: src/exch.c:774 #, c-format msgid "How many shares do you wish to sell? " -msgstr "Koliko dionica želite prodati?" +msgstr "Koliko dionica želite prodati? " #: src/exch.c:802 #, c-format @@ -1327,21 +1327,21 @@ msgid "" " ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" msgstr "" -"^B„Star Traders”^N (Međuzvjezdani trgovci) je jednostavna igra međuzvjezdanog\n" -"trgovanja. Cilj igre je skupiti što je moguće veće bogatstvo. Ovo činite\n" -"stvaranjem međuzvjezdanih trgovačkih putova, njihovim proširivanjem i\n" -"kupovanjem udjela u tvrtkama koje upravljaju njima. Vrijednost dionica se\n" -"povećava širenjem poslovanja tvrtki, kao i njihova dobit (izražena u\n" -"postocima). Igrači također mogu posuđivati novce od Međuzvjezdane trgovačke\n" +"^B„Star Traders”^N (Međuzvjezdani trgovci) je jednostavna igra međuzvjezdanog\n" +"trgovanja. Cilj igre je skupiti što je moguće veće bogatstvo. Ovo činite\n" +"stvaranjem međuzvjezdanih trgovačkih putova, njihovim proširivanjem i\n" +"kupovanjem udjela u tvrtkama koje upravljaju njima. Vrijednost dionica se\n" +"povećava širenjem poslovanja tvrtki, kao i njihova dobit (izražena u\n" +"postocima). Igrači također mogu posuđivati novce od Međuzvjezdane trgovačke\n" "banke za financiranje kupovanja dodatnih dionica na Burzi.\n" "\n" -"Karta galaksije prikazana je mrežom ^B~x^N x ^B~y^N. Uobičajeni prikaz dijela\n" +"Karta galaksije prikazana je mrežom ^B~x^N x ^B~y^N. Uobičajeni prikaz dijela\n" "galaksije može biti:\n" "\n" -" ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\r\n" -" ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N označava ^Bprazan prostor^N,\r\n" -" ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N ^s ~* ^N označava ^Bzvijezdu^N.\r\n" -" ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\r\n" +" ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N označava ^Bprazan prostor^N,\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N ^s ~* ^N označava ^Bzvijezdu^N.\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" #: src/help.c:132 @@ -1362,9 +1362,9 @@ msgid "" "will set up an ^Boutpost^N, not belonging to any company. Thus, if move ^k~3^N is\n" "selected on the above map, a ^o ~+ ^N would be placed at that position.\n" msgstr "" -"Računalo slučajno bira ^B~m^N poteza (označenih s ^k~1^N do ^k~M^N) i postavlja ih na\n" -"kartu. Za odabir jednog od označenih položaja pritisnite to slovo.\n" -"Na primjer, neki potezi na karti mogu biti:\n" +"Računalo slučajno bira ^B~m^N poteza (označenih s ^k~1^N do ^k~M^N) i postavlja ih na\n" +"kartu. Za odabir jednog od označenih položaja pritisnite to slovo. Na\n" +"primjer, neki potezi na karti mogu biti:\n" "\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1374,7 +1374,7 @@ msgstr "" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" "\n" "\n" -"Odabir položaja koji ^Bnije^N uz zvijezdu (npr. položaji ^k~1^N, ^k~3^N ili ^k~5^N) će\n" +"Odabir položaja koji ^Bnije^N uz zvijezdu (npr. položaji ^k~1^N, ^k~3^N ili ^k~5^N) će\n" "postaviti ^Bizvidnicu^N, koja ne pripada nijednoj tvrtci. Tako će odabir poteza\n" "^k~3^N na gornjoj karti postaviti ^o ~+ ^N na taj položaj.\n" @@ -1396,15 +1396,15 @@ msgid "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" msgstr "" -"S druge strane, ako je odabran položaj pokraj zvijezde (ili druge izvidnice),\n" -"osnovat će se ^Btvrtka^N i njezino će se početno slovo pojaviti na karti.\n" -"Kao nagradu za osnivanje tvrtke dobit ćete prvih pet njezinih dionica.\n" -"Na ovaj način možete osnovati ^B~c^N tvrtki.\n" +"S druge strane, ako je odabran položaj pokraj zvijezde (ili druge\n" +"izvidnice), osnovat će se ^Btvrtka^N i njezino će se početno slovo pojaviti na\n" +"karti. Kao nagradu za osnivanje tvrtke dobit ćete prvih pet njezinih\n" +"dionica. Na ovaj način možete osnovati ^B~c^N tvrtki.\n" "\n" -"Ako je odabran položaj pokraj postojeće tvrtke, ona će proširiti svoje\n" -"poslovanje za jedno polje. ovo povećava cijenu njezinih dionica i vaše\n" -"prihode. Na primjer, ako je mapa kao što je prikazana dolje, biranjem ^k~6^N\n" -"ili ^k~8^N će se povećati trgovački put tvrtke ^B~B^N:\n" +"Ako je odabran položaj pokraj postojeće tvrtke, ona će proširiti svoje\n" +"poslovanje za jedno polje. Ovo povećava cijenu njezinih dionica i vaše\n" +"prihode. Na primjer, ako je mapa kao što je prikazana dolje, biranjem ^k~6^N ili\n" +"^k~8^N će se povećati trgovački put tvrtke ^B~B^N:\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" @@ -1430,21 +1430,21 @@ msgid "" "more valuable: the company's share price will increase by a greater amount\n" "than it would for outposts not next to stars.\n" msgstr "" -"Odabir položaja pokraj zvijezde povećava vrijednost vaših dionica oko pet\n" -"puta više nego širenje u polje koje nije pokraj zvijezde. Zato se potez ^k~6^N\n" +"Odabir položaja pokraj zvijezde povećava vrijednost vaših dionica oko pet\n" +"puta više nego širenje u polje koje nije pokraj zvijezde. Zato se potez ^k~6^N\n" "preferira u odnosu na potez ^k~8^N.\n" "\n" " ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" -" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Potez ^k~6^N se preferira\n" -" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N u odnosu na ^k~8^N.\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Potez ^k~6^N se preferira u odnosu na ^k~8^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" "\n" -"Također možete proširiti tvrtku biranjem položaja pokraj izvidnica. Takve\n" -"izvidnice će se spojiti u tvrtku. Tako će potez ^k~1^N proširiti tvrtku ^B~C^N\n" -"za ^Bdva^N polja. Kao bonus, izvidnice pokraj zvijezda su još vrijednije:\n" -"vrijednost dionice tvrtke će se više povećati nego u slučaju izvidnica koje\n" -"se ne nalaze uz zvijezde.\n" +"Također možete proširiti tvrtku biranjem položaja pokraj izvidnica. Takve\n" +"izvidnice će se spojiti u tvrtku. Tako će potez ^k~1^N proširiti tvrtku ^B~C^N za ^Bdva^N\n" +"polja. Kao bonus, izvidnice pokraj zvijezda su još vrijednije: vrijednost\n" +"dionice tvrtke će se više povećati nego u slučaju izvidnica koje se ne\n" +"nalaze uz zvijezde.\n" #: src/help.c:186 msgid "" @@ -1465,12 +1465,12 @@ msgid "" "proportional to the amount owned in the old company. As well, a cash bonus\n" "is also paid, proportional to the percentage of the old company owned.\n" msgstr "" -"Ako su dvije tvrtke na karti odvojene samo jednim poljem, mogu se ^Bspojiti^N\n" -"u jednu tvrtku odabirom tog položaja (ako je dostupan). Na primjer, na donjoj\n" -"karti, tvrtke ^B~A^N i ^B~B^N se mogu spojiti odabirom ^k~5^N. Kad se to\n" -"dogodi, tvrtka koja ima veću vrijednost preuzima tvrtku manje vrijednosti.\n" -"Ovdje tvrtka ^B~B^N može preuzeti tvrtku ^B~A^N. Tvrtka ^B~A^N prestaje postojati,\n" -"iako se poslije može pojaviti kao potpuno nova tvrtka.\n" +"Ako su dvije tvrtke na karti odvojene samo jednim poljem, mogu se ^Bspojiti^N u\n" +"jednu tvrtku odabirom tog položaja (ako je dostupan). Na primjer, na donjoj\n" +"karti, tvrtke ^B~A^N i ^B~B^N se mogu spojiti odabirom ^k~5^N. Kad se to dogodi, tvrtka\n" +"koja ima veću vrijednost preuzima tvrtku manje vrijednosti. Ovdje tvrtka ^B~B^N\n" +"može preuzeti tvrtku ^B~A^N. Tvrtka ^B~A^N prestaje postojati, iako se poslije može\n" +"pojaviti kao potpuno nova tvrtka.\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n" @@ -1478,9 +1478,9 @@ msgstr "" " ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n" "\n" -"Nakon spajanja tvrtki, igrači dobivaju broj dionica dominantne tvrtke\n" -"proporcionalan udjelu u staroj tvrtci. Također se isplaćuje gotovinski bonus\n" -"proporcionalan postotku udjela u staroj tvrtci.\n" +"Nakon spajanja tvrtki, igrači dobivaju broj dionica dominantne tvrtke\n" +"proporcionalan udjelu u staroj tvrtci. Također se isplaćuje gotovinski\n" +"bonus proporcionalan postotku udjela u staroj tvrtci.\n" #: src/help.c:205 msgid "" @@ -1501,22 +1501,22 @@ msgid "" "The ^Bwinner of the game^N is the person with the greatest net worth (total\n" "value of cash, stock and debt). ^HGood luck^N and may the best person win!\n" msgstr "" -"Kada odaberete svoj potez, ulazite u ^BMeđuzvjezdanu burzu^N. Ovdje možete\n" -"kupovati dionice, prodavati ih, posuđivati novce od Trgovačke banke ili\n" -"otplatiti dio vašeg duga (ako postoji). Primijetite da svaka tvrtka izdaje\n" -"ograničen broj dionica -- ne možete kupovati cijelo vrijeme! Međutim, možete\n" -"tražiti od tvrtke izdavanje novih dionica. Ako imate veću količinu udjela\n" -"u tvrtci, veće su vam šanse za uspjeh.\n" +"Kada odaberete svoj potez, ulazite u ^BMeđuzvjezdanu burzu^N. Ovdje možete\n" +"kupovati dionice, prodavati ih, posuđivati novce od Trgovačke banke ili\n" +"otplatiti dio vašeg duga (ako postoji). Primijetite da svaka tvrtka izdaje\n" +"ograničen broj dionica -- ne možete kupovati cijelo vrijeme! Međutim,\n" +"možete tražiti od tvrtke izdavanje novih dionica. Ako imate veću količinu\n" +"udjela u tvrtci, veće su vam šanse za uspjeh.\n" "\n" -"Igra uobičajeno završava nakon ^B~t^N poteza. Međutim, možete završiti ranije\n" -"pritiskom ^K^N umjesto odabira poteza. Također pojedini igrači mogu\n" -"objaviti bankrot u svakom trenutku. Ako je vaš dug prevelik, Banka to može\n" -"učiniti umjesto vas! Ako ste prezauzeti za dovršavanje igre, možete je\n" +"Igra uobičajeno završava nakon ^B~t^N poteza. Međutim, možete završiti ranije\n" +"pritiskom ^K^N umjesto odabira poteza. Također pojedini igrači mogu\n" +"objaviti bankrot u svakom trenutku. Ako je vaš dug prevelik, Banka to može\n" +"učiniti umjesto vas! Ako ste prezauzeti za dovršavanje igre, možete je\n" "spremiti i nastaviti kasnije.\n" "\n" "\n" -"^BPobjednik igre^N je osoba koja ima najveću ukupnu vrijednost (ukupna\n" -"vrijednost gotovine, dionica i duga). ^HSretno^N i neka najbolji pobijedi!\n" +"^BPobjednik igre^N je osoba koja ima najveću ukupnu vrijednost (ukupna\n" +"vrijednost gotovine, dionica i duga). ^HSretno^N i neka najbolji pobijedi!\n" #: src/help.c:225 msgid "@ Help text, page 7\n" From 0f66fc34c583cfe01c7bcd792b330f3d227d61a9 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 20 Sep 2012 19:56:11 +1000 Subject: [PATCH 02/39] Update to the latest version available from the GNU Autoconf archive --- m4/ax_cflags_warn_all.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/m4/ax_cflags_warn_all.m4 b/m4/ax_cflags_warn_all.m4 index c22e37f..0fa3e18 100644 --- a/m4/ax_cflags_warn_all.m4 +++ b/m4/ax_cflags_warn_all.m4 @@ -58,7 +58,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 13 +#serial 14 AC_DEFUN([AX_FLAGS_WARN_ALL],[dnl AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl @@ -84,6 +84,7 @@ done FLAGS="$ac_save_[]FLAGS" ]) AS_VAR_POPDEF([FLAGS])dnl +AC_REQUIRE([AX_APPEND_FLAG]) case ".$VAR" in .ok|.ok,*) m4_ifvaln($3,$3) ;; .|.no|.no,*) m4_default($4,[m4_ifval($2,[AX_APPEND_FLAG([$2], [$1])])]) ;; From 06859b46f099433dac6d6b715a8beee28e6f54ad Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 20 Sep 2012 20:24:31 +1000 Subject: [PATCH 03/39] The gperf(1) utility program is not always needed The gperf(1) utility program is only needed if the timestamps on the lib/iconv_open-*.h files are older than the corresponding *.gperf files. --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index b50b4a0..76424c6 100644 --- a/INSTALL +++ b/INSTALL @@ -48,7 +48,7 @@ and installation: systems, these files are part of XXX-dev packages. 6. The GNU Perfect Hash Function Generator, gperf. This utility program - is required for parts of the GNU Portability Library. + may be required for parts of the GNU Portability Library. Installation From 4fb5b206ad7f37ba572035389b8b0ac2de82215b Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Mon, 5 Nov 2012 19:39:25 +1100 Subject: [PATCH 04/39] Add the Norwegian Bokmaal translation by Johnny A. Solbu Downloaded from the Translation Project, http://translationproject.org/PO-files/nb/trader-7.4.nb.po --- po/nb.po | 1707 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1707 insertions(+) create mode 100644 po/nb.po diff --git a/po/nb.po b/po/nb.po new file mode 100644 index 0000000..1dfcdbe --- /dev/null +++ b/po/nb.po @@ -0,0 +1,1707 @@ +# Norwegian Bokmal translations for trader package. +# Copyright (C) 2012 John Zaitseff +# This file is distributed under the same license as the trader package. +# +# Johnny A. Solbu , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: trader 7.4\n" +"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" +"POT-Creation-Date: 2012-05-09 13:57+1000\n" +"PO-Revision-Date: 2012-11-05 07:46+0100\n" +"Last-Translator: Johnny A. Solbu \n" +"Language-Team: Norwegian Bokmaal \n" +"Language: nb_NO\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/trader.c:235 +#, c-format +msgid "%s: invalid value for --max-turn: `%s'\n" +msgstr "%s: ugyldig verdi for --max-turn «%s»\n" + +#: src/trader.c:251 +#, c-format +msgid "%s: invalid operand `%s'\n" +msgstr "%s: ugyldig operand «%s»\n" + +#: src/trader.c:260 +#, c-format +msgid "%s: invalid game number `%s'\n" +msgstr "%s: Ugyldig spillnummer «%s»\n" + +#: src/trader.c:269 +#, c-format +msgid "%s: extra operand `%s'\n" +msgstr "%s: ekstra operand «%s»\n" + +#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper +#. name of the author. The IPA pronunciation in this comment is in +#. UTF-8 encoding. +#: src/trader.c:284 +#, c-format +msgid "" +"Star Traders (%s) %s\n" +"Copyright (C) %s, John Zaitseff.\n" +"\n" +"Star Traders is a simple game of interstellar trading, where the object\n" +"of the game is to create companies, buy and sell shares, borrow and repay\n" +"money, in order to become the wealthiest player (the winner).\n" +"\n" +"This program is free software that is distributed under the terms of the\n" +"GNU General Public License, version 3 or later. You are welcome to\n" +"modify and/or distribute it under certain conditions. This program has\n" +"NO WARRANTY, to the extent permitted by law; see the License for details.\n" +msgstr "" +"Star Traders (%s) %s\n" +"Opphavsrett (C)%s, John Zaitseff.\n" +"\n" +"Star Traders er et enkelt spill med interstellar handel, der målet\n" +"med spillet er å opprette firmaer, kjøpe og selge aksjer, låne og betale tilbake\n" +"penger for å bli den rikeste spilleren (vinneren).\n" +"\n" +"Dette programmet er Fri programvare som distribueres under vilkårene i\n" +"GNU General Public License, versjon 3 eller nyere. Du er velkommen til å\n" +"endre og / eller distribuere det under visse betingelser. Dette programmet har\n" +"INGEN GARANTI i den grad loven tillater, se lisens for detaljer.\n" + +#: src/trader.c:308 +#, c-format +msgid "%s: Try `%s --help' for more information.\n" +msgstr "%s: Prøv «%s --help» for mer informasjon.\n" + +#: src/trader.c:311 +#, c-format +msgid "Usage: %s [OPTION ...] [GAME]\n" +msgstr "Bruksmåte: %s [VALG]... FIL...\n" + +#: src/trader.c:312 +#, c-format +msgid "" +"Play Star Traders, a simple game of interstellar trading.\n" +"\n" +msgstr "" +"Spill Star Traders, et enkelt spill med interstellar handel.\n" +"\n" + +#: src/trader.c:315 +#, c-format +msgid "" +"Options:\n" +" -V, --version output version information and exit\n" +" -h, --help display this help and exit\n" +" --no-color don't use color for displaying text\n" +" --max-turn=NUM set the number of turns to NUM\n" +"\n" +msgstr "" +"Valg:\n" +" -V, --version vis versjonsinformasjon og avslutt\n" +" -h, --help vis denne hjelpen og avslutte\n" +" --no-color Ikke bruk farger for visning av tekst\n" +" --max-turn=NUM sette antall runder til NUM\n" +"\n" + +#: src/trader.c:322 +#, c-format +msgid "" +"If GAME is specified as a number between 1 and 9, load and continue\n" +"playing that game. If GAME is not specified, start a new game.\n" +"\n" +msgstr "" +"Hvis SPILL er angitt som et tall mellom 1 og 9, last og fortsette med\n" +"å spille det spillet. Hvis SPILL ikke er angitt, start nytt spill.\n" +"\n" + +#. TRANSLATORS: The first %s is the proper name of the package +#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is +#. the e-mail address for reporting bugs. Please add ANOTHER +#. line with the (translated) text "Report translation bugs to +#.
\n", with ADDRESS replaced with either an e-mail +#. address or web URL for reporting bugs in your translation. +#: src/trader.c:334 +#, c-format +msgid "Report bugs to %s <%s>.\n" +msgstr "Rapporter feil til %s <%s>.\n" + +#. TRANSLATORS: %s is the e-mail address for reporting bugs. As +#. with the previous string, please add ANOTHER line with the +#. (translated) text "Report translation bugs to
\n", +#. with ADDRESS replaced with either an e-mail address or web URL +#. for reporting bugs in your translation. +#: src/trader.c:341 +#, c-format +msgid "Report bugs to <%s>.\n" +msgstr "Rapporter feil til <%s>.\n" + +#. TRANSLATORS: The first %s is for packagers and may be +#. something like "Debian". +#: src/trader.c:346 +#, c-format +msgid "Report %s bugs to <%s>.\n" +msgstr "Rapporter %s feil til <%s>.\n" + +#: src/trader.c:349 +#, c-format +msgid "Star Traders home page: <%s>.\n" +msgstr "Star Traders hjemmeside: <%s>.\n" + +#. TRANSLATORS: The eight company names do NOT have to be literal +#. translations of the English names. In fact, if possible, the +#. names should start with successive letters of your alphabet (in +#. English, for example, "A" to "H"), and, ideally, be related to +#. constellations or stars in our galaxy. No company name should be +#. more than 24 characters (column positions, to be precise) long. +#: src/globals.c:47 +msgid "Altair Starways" +msgstr "Altair Starways" + +#: src/globals.c:48 +msgid "Betelgeuse, Ltd" +msgstr "Betelgeuse, Ltd" + +#: src/globals.c:49 +msgid "Capella Freight Co" +msgstr "Capella Freight Co" + +#: src/globals.c:50 +msgid "Denebola Shippers" +msgstr "Denebola Shippers" + +#: src/globals.c:51 +msgid "Eridani Expediters" +msgstr "Eridani Expediters" + +#: src/globals.c:52 +msgid "Fornax Express" +msgstr "Fornax Express" + +#: src/globals.c:53 +msgid "Gemeni Inc" +msgstr "Gemeni Inc" + +#: src/globals.c:54 +msgid "Hercules and Co" +msgstr "Hercules and Co" + +#. TRANSLATORS: This string specifies the keycodes (keyboard input +#. codes) used to enter the Stock Transaction window for each +#. company. There must be exactly eight characters, one for each +#. company in order, before the ASCII vertical line "|"; these must +#. be EITHER all in upper-case or all in lower-case. If at all +#. possible, these should be successive letters in your alphabet (in +#. English, "A" to "H"). Do NOT use digits or control characters. +#. Do not change or translate anything after the vertical line. +#: src/globals.c:68 +msgid "ABCDEFGH|input|Companies" +msgstr "ABCDEFGH|input|Companies" + +#. TRANSLATORS: This string specifies the keycodes used to select a +#. game move. There must be exactly 20 characters, one for each +#. move, before the ASCII vertical line "|"; these must be EITHER all +#. in upper-case or all in lower-case. If at all possible, these +#. should be successive letters in your alphabet. Do NOT use digits +#. or control characters. Do not change or translate anything after +#. the vertical line. +#: src/globals.c:80 +msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves" +msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves" + +#. TRANSLATORS: This string is used to display the galaxy map to +#. screen. There must be exactly 11 characters before the ASCII +#. vertical line. The first ("." in English) is used for empty +#. space, the second ("+") for outposts, the third ("*") for stars, +#. the remaining for the eight companies. Do not change or translate +#. anything after the vertical line. Double-width characters ARE +#. handled correctly. +#: src/globals.c:92 +msgid ".+*ABCDEFGH|output|MapVals" +msgstr ".+*ABCDEFGH|output|MapVals" + +#. TRANSLATORS: This string is used to display the game moves +#. (choices). There must be exactly 20 characters (NUMBER_MOVES) +#. before the ASCII vertical line. The first character corresponds +#. to the first character in the "input|GameMoves" string, and so on. +#. Do not change or translate anything after the vertical line. +#. Double-width characters ARE handled correctly. +#: src/globals.c:103 +msgid "abcdefghijklmnopqrst|output|GameMoves" +msgstr "abcdefghijklmnopqrst|output|GameMoves" + +#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the +#. Game Winner dialog box at the end of the game. If ordinals depend +#. on the gender of the player, it may be simpler to list cardinal +#. numbers instead (eg, "No. 1"). Up to five characters are allowed +#. (see ORDINAL_COLS in src/intf.h). +#: src/globals.c:114 +msgid "1st" +msgstr "1." + +#: src/globals.c:115 +msgid "2nd" +msgstr "2." + +#: src/globals.c:116 +msgid "3rd" +msgstr "3." + +#: src/globals.c:117 +msgid "4th" +msgstr "4." + +#: src/globals.c:118 +msgid "5th" +msgstr "5." + +#: src/globals.c:119 +msgid "6th" +msgstr "6." + +#: src/globals.c:120 +msgid "7th" +msgstr "7." + +#: src/globals.c:121 +msgid "8th" +msgstr "8." + +#: src/game.c:117 src/game.c:152 +#, c-format +msgid "Loading game %d... " +msgstr "Laster spill %d... " + +#: src/game.c:226 +#, c-format +msgid " First Player " +msgstr " Første spiller " + +#: src/game.c:227 +#, c-format +msgid "The first player to go is ^{%ls^}." +msgstr "Spilleren som begynner er ^{%ls^}." + +#. TRANSLATORS: The keycode should be modified to +#. match that (or those) specified with msgctxt +#. "input|ContinueGame". +#: src/game.c:259 +#, c-format +msgid "Enter number of players [^{1^}-^{%d^}] or ^{^} to continue a game: " +msgstr "Angi antall spillere [^{1^}-^{%d^}] eller ^{^} for å fortsette et spill: " + +#. TRANSLATORS: This string specifies the keycodes used to continue a +#. game; these must NOT contain any numeric digit from 1 to 9. The +#. first character (keyboard input code) is used to print the user's +#. response if one of those keys is pressed. Both upper and +#. lower-case versions should be present. +#: src/game.c:276 +msgctxt "input|ContinueGame" +msgid "Cc" +msgstr "Cc" + +#: src/game.c:341 src/move.c:399 +#, c-format +msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " +msgstr "Tast inn spill nummer [^{1^}-^{9^}] eller ^{^} for å avbryte: " + +#: src/game.c:406 +#, c-format +msgid "Please enter your name: " +msgstr "Skriv inn navnet ditt: " + +#: src/game.c:425 +#, c-format +msgid "Do you need any instructions? [^{Y^}/^{N^}] " +msgstr "Trenger du noen instruksjoner? [^{J^}/^{N^}] " + +#: src/game.c:443 +#, c-format +msgid " Enter Player Names " +msgstr " Angi Spillernavn " + +#: src/game.c:451 +#, c-format, range: 1..8 +msgid "Player %d: " +msgstr "Spiller %d: " + +#: src/game.c:529 +#, c-format +msgid "Does any player need instructions? [^{Y^}/^{N^}] " +msgstr "Trenger noen av deltakere instruksjoner? [^{J^}/^{N^}] " + +#: src/game.c:563 +#, c-format +msgid " Game Over " +msgstr " Spillet er slutt " + +#: src/game.c:564 +#, c-format +msgid "The game is over after one turn." +msgid_plural "The game is over after %d turns." +msgstr[0] "Spillet er over etter en runde." +msgstr[1] "Spillet er over etter% d runder." + +#: src/game.c:575 +#, c-format +msgid " Total Value " +msgstr " Total verdi " + +#: src/game.c:577 +#, c-format +msgid "Your total value was ^{%N^}." +msgstr "Din samlede verdi var ^{%N^}." + +#: src/game.c:588 +#, c-format +msgid "" +"The winner is ^{%ls^}\n" +"who is ^[*** BANKRUPT ***^]" +msgstr "" +"Vinneren er ^{%ls^}\n" +"som er ^[*** KONKURS ***^]" + +#: src/game.c:591 +#, c-format +msgid "" +"The winner is ^{%ls^}\n" +"with a value of ^{%N^}." +msgstr "" +"Vinneren er ^{%ls^}\n" +"med en verdi på^{%N^}." + +#: src/game.c:597 +#, c-format +msgid " Game Winner " +msgstr " Vinner av spillet " + +#. TRANSLATORS: "Player" is used as a column title in a +#. table containing all player names. +#: src/game.c:606 src/move.c:868 +#, c-format +msgctxt "subtitle" +msgid "Player" +msgstr "Spiller" + +#. TRANSLATORS: "Total Value" refers to the total worth +#. (shares, cash and debt) of any given player. %ls is the +#. currency symbol of the current locale. +#: src/game.c:611 +#, c-format +msgctxt "subtitle" +msgid "Total Value (%ls)" +msgstr "Total verdi (%ls)" + +#: src/game.c:645 src/game.c:695 src/exch.c:100 +#, c-format +msgid "Player: ^{%ls^}" +msgstr "Spiller: ^{%ls^}" + +#: src/game.c:648 +#, c-format +msgid " Turn: ^{%d^} " +msgstr " Runde: ^{%d^} " + +#: src/game.c:649 +#, c-format +msgid " ^[*** Last Turn ***^] " +msgstr " ^[*** Forrige runde ***^] " + +#: src/game.c:693 +#, c-format +msgid " Stock Portfolio " +msgstr " Aksjeportefølje " + +#. TRANSLATORS: The current player is bankrupt (has no +#. shares or cash, ie, whose total value is zero) +#: src/game.c:702 +#, c-format +msgid "^[* * * B A N K R U P T * * *^]" +msgstr "^[* * * K O N K U R S * * *^]" + +#: src/game.c:717 src/exch.c:112 +#, c-format +msgid "No companies on the map" +msgstr "Ingen bedrifter på kartet" + +#. TRANSLATORS: "Company" is a two-line column label in +#. a table containing a list of companies. +#: src/game.c:725 src/exch.c:120 +#, c-format +msgctxt "subtitle" +msgid "" +"\n" +"Company" +msgstr "" +"\n" +"Firma" + +#. TRANSLATORS: "Ownership" is a two-line column label +#. in a table containing the current player's +#. percentage ownership in any given company. The +#. maximum column width is 10 characters (see +#. OWNERSHIP_COLS in src/intf.h). +#: src/game.c:732 +#, c-format +msgctxt "subtitle" +msgid "" +"Ownership\n" +"(%%)" +msgstr "" +"Eierskap\n" +"(%%)" + +#. TRANSLATORS: "Holdings" is a two-line column label +#. in a table containing the number of shares the +#. current player owns in any given company. The +#. maximum column width is 10 characters (see +#. STOCK_OWNED_COLS in src/intf.h). +#: src/game.c:739 +#, c-format +msgctxt "subtitle" +msgid "" +"Holdings\n" +"(shares)" +msgstr "" +"Beholdning\n" +"(aksjer)" + +#. TRANSLATORS: "Return" is a two-line column label in +#. a table containing the share return as a percentage +#. in any given company. The maximum column width is +#. 10 characters (see SHARE_RETURN_COLS in src/intf.h). +#: src/game.c:746 src/exch.c:141 +#, c-format +msgctxt "subtitle" +msgid "" +"Return\n" +"(%%)" +msgstr "" +"Utbytte\n" +"(%%)" + +#. TRANSLATORS: "Price per share" is a two-line column +#. label in a table containing the price per share in +#. any given company. %ls is the currency symbol in +#. the current locale. The maximum column width is 12 +#. characters INCLUDING the currency symbol (see +#. SHARE_PRICE_COLS in src/intf.h). +#: src/game.c:755 src/exch.c:150 +#, c-format +msgctxt "subtitle" +msgid "" +"Price per\n" +"share (%ls)" +msgstr "" +"Pris per\n" +"aksje (%ls)" + +#. TRANSLATORS: The "Total value", "Current cash", +#. "Current debt" and "Interest rate" labels MUST all be +#. the same length (ie, right-padded with spaces as +#. needed) and must have at least one trailing space so +#. that the display routines work correctly. The maximum +#. length of each label is 36 characters. +#. +#. Note that some of these labels are used for both the +#. Player Status window and the Trading Bank window. +#: src/game.c:796 +#, c-format +msgctxt "label" +msgid "Total value: " +msgstr "Total verdi: " + +#: src/game.c:800 src/exch.c:324 +#, c-format +msgctxt "label" +msgid "Current cash: " +msgstr "Nåværende kontanter: " + +#: src/game.c:807 src/exch.c:332 +#, c-format +msgctxt "label" +msgid "Current debt: " +msgstr "eksisterende gjeld: " + +#: src/game.c:813 src/exch.c:337 +#, c-format +msgctxt "label" +msgid "Interest rate: " +msgstr "Rentesats: " + +#. TRANSLATORS: Each label may be up to 37 characters wide +#. (for <1> and <2>) or 38 characters wide (for <3> and +#. ). The sequences "^{" and "^}" change the +#. character rendition (attributes) and take up no space. +#: src/move.c:243 src/exch.c:182 +#, c-format +msgid "^{<1>^} Display stock portfolio" +msgstr "^{<1>^} Vis aksjeportefølje" + +#: src/move.c:245 +#, c-format +msgid "^{<2>^} Declare bankruptcy" +msgstr "^{<2>^} Gå konkurs" + +#: src/move.c:247 +#, c-format +msgid "^{<3>^} Save and end the game" +msgstr "^{<3>^} Lagre og avslutt spillet" + +#: src/move.c:249 +#, c-format +msgid "^{^} Quit the game" +msgstr "^{^} Avslutt spillet" + +#. TRANSLATORS: The maximum column width is 38 characters, +#. including the trailing space. The sequences "^{", "^}", +#. "^[" and "^]" do not take up any room. "%lc" takes up +#. either one or two columns, depending on the appropriate +#. "output|GameMoves" string in the current PO file. +#: src/move.c:258 +#, c-format +msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " +msgstr "Velg trekk [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " + +#. TRANSLATORS: A game usually consists of +#. DEFAULT_MAX_TURN (50) turns. On each +#. turn, the computer randomly selects +#. NUMBER_MOVES (20) moves (positions on the +#. map); each player selects just one move +#. per turn. "Move" refers to the player's +#. choice. +#: src/move.c:295 +#, c-format +msgid "Move ^{%lc^}" +msgstr "Trekk ^{%lc^}" + +#: src/move.c:316 +#, c-format +msgid "^{<2>^} (Declare bankruptcy)" +msgstr "^{<2>^} (Gå konkurs)" + +#: src/move.c:325 +#, c-format +msgid "^{<3>^} (Save and end the game)" +msgstr "^{<3>^} (Lagre og avslutt spillet)" + +#: src/move.c:346 +#, c-format +msgid "^{^} (Quit the game)" +msgstr "^{^} (Avslutt spillet)" + +#: src/move.c:361 +#, c-format +msgid "Are you sure? [^{Y^}/^{N^}] " +msgstr "Er du sikker? [^{Y^}/^{N^}] " + +#: src/move.c:378 src/move.c:456 +#, c-format +msgid "Saving game %d... " +msgstr "Lagrer spill %d... " + +#: src/move.c:686 src/move.c:694 src/move.c:1052 src/move.c:1089 +#, c-format +msgid " Bankruptcy Court " +msgstr " Skifteretten " + +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:688 +#, c-format +msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." +msgstr "%ls er erklært konkurs av Interstellar Handelsbank." + +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:696 +#, c-format +msgid "%ls has declared bankruptcy." +msgstr "%ls har gått konkurs." + +#: src/move.c:764 +#, c-format +msgid " New Company " +msgstr " Nytt firma " + +#: src/move.c:765 +#, c-format +msgid "" +"A new company has been formed!\n" +"Its name is ^{%ls^}." +msgstr "" +"Et nytt firma er opprettet!\n" +"Navnet er ^{%ls^}." + +#: src/move.c:824 +#, c-format +msgid "" +"^{%ls^} has just merged into ^{%ls^}.\n" +"Please note the following transactions:\n" +msgstr "" +"^{%ls^} har nettopp fusjonert med ^{%ls^}.\n" +"Vær oppmerksom på følgende transaksjoner:\n" + +#: src/move.c:830 +#, c-format +msgid " Company Merger " +msgstr " Fusjon " + +#. TRANSLATORS: "Old stock" refers to the company that has +#. just ceased existence due to a merger. +#. +#. Note that the "Old stock" and "New stock" labels MUST be +#. the same length and must contain a trailing space for the +#. display routines to work correctly. The maximum length of +#. each label is 36 characters. +#: src/move.c:850 +#, c-format +msgctxt "label" +msgid "Old stock: " +msgstr "Gamle aksjer: " + +#. TRANSLATORS: "New stock" refers to the company that has +#. absorbed the other due to a merger. +#: src/move.c:861 +#, c-format +msgctxt "label" +msgid "New Stock: " +msgstr " Nye aksjer: " + +#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to +#. each player after two companies merge. %ls is the currency +#. symbol in the current locale. The maximum column width is +#. 12 characters INCLUDING the currency symbol (see +#. MERGE_BONUS_COLS in src/intf.h). +#: src/move.c:875 +#, c-format +msgctxt "subtitle" +msgid "Bonus (%ls)" +msgstr "Bonus (%ls)" + +#. TRANSLATORS: "Total" refers to the total number of shares in +#. the new company after a merger. The maximum column width is +#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). +#: src/move.c:880 +#, c-format +msgctxt "subtitle" +msgid "Total" +msgstr "Totalt" + +#. TRANSLATORS: "New" refers to how many (new) shares each +#. player receives in the surviving company after a merger. +#. The maximum column width is 8 characters (see +#. MERGE_NEW_STOCK_COLS in src/intf.h). +#: src/move.c:887 +#, c-format +msgctxt "subtitle" +msgid "New" +msgstr "Ny" + +#. TRANSLATORS: "Old" refers to how many shares each player had +#. in the company ceasing existence. The maximum column width +#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). +#: src/move.c:893 +#, c-format +msgctxt "subtitle" +msgid "Old" +msgstr "Gammel" + +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1054 +#, c-format +msgid "" +"%ls has been declared bankrupt by the Interstellar Trading Bank.\n" +"\n" +"^{All assets have been taken to repay outstanding loans.^}" +msgstr "" +"%ls er erklært konkurs av Interstellar Handelsbank.\n" +"\n" +"^{Alle eiendeler er overtatt for å betale tilbake utestående lån.^}" + +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1078 +#, c-format +msgid "" +"%ls has been declared bankrupt by the Interstellar Trading Bank.\n" +"\n" +"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}" +msgstr "" +"%ls er erklært konkurs av Interstellar Handelsbank.\n" +"\n" +"^{Banken har avtalt å betale aksjonærer ^}%.2f%%^{av aksjeverdien på hver aksje.^}" + +#. TRANSLATORS: The label "Amount paid per share" +#. refers to payment made by the Interstellar +#. Trading Bank to each player upon company +#. bankruptcy. This label MUST be the same +#. length as "Old share value" and MUST have at +#. least one trailing space for the display +#. routines to work correctly. The maximum +#. length is 28 characters. +#: src/move.c:1106 +#, c-format +msgctxt "label" +msgid "Amount paid per share: " +msgstr "Betalt beløp per aksje:" + +#. TRANSLATORS: "Old share value" refers to the +#. share price of a company before it was forced +#. into bankruptcy by the Bank. This label must be +#. the same width as "Amount paid per share". +#: src/move.c:1114 +#, c-format +msgctxt "label" +msgid "Old share value: " +msgstr "Gammel aksjeverdi: " + +#: src/move.c:1197 src/move.c:1232 src/exch.c:321 +#, c-format +msgid " Interstellar Trading Bank " +msgstr "Interstellar handelsbank " + +#: src/move.c:1199 +#, c-format +msgid "" +"You were forced to borrow %N\n" +"to cover losses from company shares." +msgstr "" +"Du ble tvunget til å låne %N\n" +"til å dekke tap fra selskapets aksjer." + +#: src/move.c:1234 +#, c-format +msgid "" +"Your debt has amounted to %N!\n" +"^{The Bank has impounded ^}%N^{ from your cash.^}" +msgstr "" +"Din gjeld har utgjort %N!\n" +"^{Banken har beslaglagt ^}%N^{ fra kontantbeholdningen.^}" + +#: src/exch.c:98 +#, c-format +msgid " Interstellar Stock Exchange " +msgstr "Interstellar børs " + +#. TRANSLATORS: "Shares left" is a two-line column +#. label in a table containing the number of shares +#. left to be purchased in any given company. The +#. maximum column width is 10 characters (see +#. STOCK_LEFT_COLS in src/intf.h). +#: src/exch.c:127 +#, c-format +msgctxt "subtitle" +msgid "" +"Shares\n" +"left" +msgstr "" +"Aksjer\n" +"igjen" + +#. TRANSLATORS: "Shares issued" is a two-line column +#. label in a table containing the number of shares +#. already sold (ie, bought by all players) in any +#. given company. The maximum column width is 10 +#. characters (see STOCK_ISSUED_COLS in src/intf.h). +#: src/exch.c:134 +#, c-format +msgctxt "subtitle" +msgid "" +"Shares\n" +"issued" +msgstr "" +"Aksjer\n" +"utstedt" + +#. TRANSLATORS: Each label may be up to 37 characters wide +#. (for <1> and <2>) or 38 characters wide (for <3> and <4>). +#: src/exch.c:186 +#, c-format +msgid "^{<2>^} Display galaxy map" +msgstr "^{<2>^} Vis galaksekart" + +#: src/exch.c:188 +#, c-format +msgid "^{<3>^} Visit the Trading Bank" +msgstr "^{<3>^} Besøke Handelsbanken" + +#: src/exch.c:190 +#, c-format +msgid "^{<4>^} Exit the Stock Exchange" +msgstr "^{<4>^} Forlat børsen" + +#: src/exch.c:193 +#, c-format +msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " +msgstr "Angi valg [^[Firmabrev^]/^{1^}-^{4^}]: " + +#. TRANSLATORS: The "Total value", "Current cash", "Current +#. debt", "Interest rate" and "Credit limit" labels MUST all be +#. the same length (ie, right-padded with spaces as needed) and +#. must have at least one trailing space so that the display +#. routines work correctly. The maximum length of each label +#. is 36 characters. +#. +#. Note that some of these labels are used for both the Player +#. Status window and the Trading Bank window. +#: src/exch.c:351 +#, c-format +msgctxt "label" +msgid "Credit limit: " +msgstr "Kredittgrense: " + +#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit +#. from the Bank" menu options must all be the same length +#. (ie, padded with trailing spaces as required). The maximum +#. length is 72 characters. +#: src/exch.c:366 +#, c-format +msgid "^{<1>^} Borrow money " +msgstr "^{<1>^} Låne penger " + +#: src/exch.c:368 +#, c-format +msgid "^{<2>^} Repay debt " +msgstr "^{<2>^} Nedbetal gjeld " + +#: src/exch.c:370 +#, c-format +msgid "^{<3>^} Exit from the Bank" +msgstr "^{<3>^} Gå ut av banken" + +#: src/exch.c:373 +#, c-format +msgid "Enter selection [^{1^}-^{3^}]: " +msgstr "Angi valg [^{1^}-^{3^}]: " + +#: src/exch.c:426 +#, c-format +msgid " Insufficient Credit Limit " +msgstr " Utilstrekkelig kredittgrense " + +#: src/exch.c:427 +#, c-format +msgid "The Bank will not lend you any more money." +msgstr "Banken vil ikke låne deg mer penger." + +#: src/exch.c:447 +#, c-format +msgid "How much do you wish to borrow? " +msgstr "Hvor mye ønsker du å låne? " + +#: src/exch.c:479 +#, c-format +msgid " No Debt " +msgstr " Ingen gjeld " + +#: src/exch.c:480 +#, c-format +msgid "You have no debt to repay." +msgstr "Du har ingen gjeld å betale." + +#: src/exch.c:484 +#, c-format +msgid " No Cash " +msgstr " Ingen kontanter " + +#: src/exch.c:485 +#, c-format +msgid "You have no cash with which to repay the debt!" +msgstr "Du har ingen penger å nedbetale gjeld med!" + +#: src/exch.c:505 +#, c-format +msgid "How much do you wish to repay? " +msgstr "Hvor mye ønsker du å tilbakebetale? " + +#. TRANSLATORS: %ls represents the company name. +#: src/exch.c:581 +#, c-format +msgid " Stock Transaction in %ls " +msgstr " Aksjetransaksjon for %ls " + +#. TRANSLATORS: "Shares issued" represents the number of +#. shares already sold by the company to all players. +#. +#. Note that the labels "Shares issued", "Shares left", +#. "Price per share" and "Return" must all be the same length +#. and must have at least one trailing space for the output +#. routines to work correctly. The maximum length of each +#. label is 22 characters. +#: src/exch.c:592 +#, c-format +msgctxt "label|Stock A" +msgid "Shares issued: " +msgstr "Aksjer utstedt: " + +#. TRANSLATORS: "Shares left" is the number of shares that are +#. left to be purchased in the current company. +#: src/exch.c:600 +#, c-format +msgctxt "label|Stock A" +msgid "Shares left: " +msgstr "Aksjer igjen: " + +#. TRANSLATORS: "Price per share" is the cost of each share in +#. the current company. +#: src/exch.c:607 +#, c-format +msgctxt "label|Stock A" +msgid "Price per share: " +msgstr "Pris per aksje:" + +#. TRANSLATORS: "Return" is the share return as a percentage. +#: src/exch.c:613 +#, c-format +msgctxt "label|Stock A" +msgid "Return: " +msgstr "Utbytte: " + +#. TRANSLATORS: "Current holdings" is the number of shares the +#. current player owns in this particular company. +#. +#. Note that the labels "Current holdings", "Percentage owned" +#. and "Current cash" MUST all be the same length and contain at +#. least one trailing space for the display routines to work +#. correctly. The maximum length of each label is 18 +#. characters. +#: src/exch.c:626 +#, c-format +msgctxt "label|Stock B" +msgid "Current holdings: " +msgstr "Nåværende aksjepost: " + +#. TRANSLATORS: "Percentage owned" is the current player's +#. percentage ownership in this particular company. +#: src/exch.c:633 +#, c-format +msgctxt "label|Stock B" +msgid "Percentage owned: " +msgstr "Eierandel: " + +#: src/exch.c:638 +#, c-format +msgctxt "label|Stock B" +msgid "Current cash: " +msgstr "Nåværende kontanter: " + +#. TRANSLATORS: Each label may be up to 35 characters wide +#. (for <1> and <2>) or 36 characters wide (for <3> and <4>). +#: src/exch.c:651 +#, c-format +msgid "^{<1>^} Buy stock from company" +msgstr "^{<1>^} Kjøp aksjer fra selskap" + +#: src/exch.c:653 +#, c-format +msgid "^{<2>^} Sell stock back to company" +msgstr "^{<2>^} Selg aksjer tilbake til selskap" + +#: src/exch.c:655 +#, c-format +msgid "^{<3>^} Bid company to issue more shares" +msgstr "^{<3>^} Oppmode firmaet til å utstede flere aksjer" + +#: src/exch.c:657 +#, c-format +msgid "^{<4>^} Exit to the Stock Exchange" +msgstr "^{<4>^} Forlat børsen" + +#: src/exch.c:660 +#, c-format +msgid "Enter selection [^{1^}-^{4^}]: " +msgstr "Angi valg [^{1^}-^{4^}]: " + +#: src/exch.c:716 +#, c-format +msgid " No Shares Available " +msgstr " Ingen aksjer tilgjengelig " + +#: src/exch.c:717 +#, c-format +msgid "No more shares are available for purchase." +msgstr "Ingen flere aksjer er tilgjengelig for kjøp." + +#: src/exch.c:721 +#, c-format +msgid " Insufficient Cash " +msgstr " Ikke nok penger " + +#: src/exch.c:722 +#, c-format +msgid "" +"You do not have enough cash\n" +"to purchase additional shares." +msgstr "" +"Du har ikke nok penger\n" +"til å kjøpe flere aksjer." + +#: src/exch.c:733 +#, c-format +msgid "You can purchase ^{one^} share." +msgid_plural "You can purchase up to ^{%'ld^} shares." +msgstr[0] "Du kan kjøpe ^{en^} aksje." +msgstr[1] "Du kan kjøpe opptil ^{%'ld^} aksjer." + +#: src/exch.c:739 +#, c-format +msgid "How many shares do you wish to purchase? " +msgstr "Hvor mange aksjer ønsker du å kjøpe? " + +#: src/exch.c:760 +#, c-format +msgid " No Shares " +msgstr " Ingen aksjer " + +#: src/exch.c:761 +#, c-format +msgid "You do not have any shares to sell." +msgstr "Du har ingen aksjer å selge." + +#: src/exch.c:768 +#, c-format +msgid "You can sell ^{one^} share." +msgid_plural "You can sell up to ^{%'ld^} shares." +msgstr[0] "Du kan selge ^{en^} aksje." +msgstr[1] "Du kan selge opptil ^{%'ld^} aksjer." + +#: src/exch.c:774 +#, c-format +msgid "How many shares do you wish to sell? " +msgstr "Hvor mange aksjer ønsker du å selge? " + +#: src/exch.c:802 +#, c-format +msgid " No Shares Issued " +msgstr " Ingen aksjer utstedt " + +#. TRANSLATORS: %ls represents the company name. +#: src/exch.c:804 +#, c-format +msgid "" +"%ls has refused\n" +"to issue more shares." +msgstr "" +"%ls har avslått\n" +"å utstede flere aksjer." + +#: src/exch.c:809 +#, c-format +msgid " Shares Issued " +msgstr " Aksjer utstedt " + +#. TRANSLATORS: %ls represents the company name. +#: src/exch.c:811 +#, c-format +msgid "" +"%ls has issued\n" +"^{one^} more share." +msgid_plural "" +"%ls has issued\n" +"^{%'ld^} more shares." +msgstr[0] "" +"%ls har utstedt\n" +"^{en^} ny aksje." +msgstr[1] "" +"%ls har utstedt\n" +"^{%'ld^} nye aksjer." + +#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#, c-format +msgid "%s: missing field on line %d" +msgstr "%s: manglende felt på linje %d" + +#: src/fileio.c:60 +#, c-format +msgid "%s: illegal field on line %d: `%s'" +msgstr "%s: ugyldig felt på linje %d: «%s»" + +#: src/fileio.c:64 +#, c-format +msgid "%s: illegal value on line %d: `%s'" +msgstr "%s: ugyldig verdi på linje %d: «%s»" + +#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 +#, c-format +msgid "%s: illegal value on line %d" +msgstr "%s: ugyldig verdi på linje %d" + +#: src/fileio.c:103 +#, c-format +msgid "%s: illegal characters on line %d" +msgstr "%s: ugyldig tegn på linje %d" + +#: src/fileio.c:184 +#, c-format +msgid "%s: could not convert string" +msgstr "%s: kunne ikke konvertere streng" + +#: src/fileio.c:255 +#, c-format +msgid " Game Not Found " +msgstr " Spill ikke funnet " + +#: src/fileio.c:256 +#, c-format +msgid "Game %d has not been saved to disk." +msgstr "Spillet %d er ikke lagret på disken." + +#: src/fileio.c:263 +#, c-format +msgid " Game Not Loaded " +msgstr " Spill ikke lastet " + +#: src/fileio.c:264 +#, c-format +msgid "" +"Game %d could not be loaded from disk.\n" +"\n" +"^{File %s: %s^}" +msgstr "" +"Spillet %d kunne ikke lastes fra disk\n" +"\n" +"^{Fil %s: %s^}" + +#: src/fileio.c:316 +#, c-format +msgid "%s: missing header in game file" +msgstr "%s: mangler topptekst i spillfilen" + +#: src/fileio.c:319 +#, c-format +msgid "%s: not a valid game file" +msgstr "%s: ikke en gyldig spillfil" + +#: src/fileio.c:322 src/fileio.c:329 +#, c-format +msgid "%s: missing subheader in game file" +msgstr "%s: mangler undertittel i spillfilen" + +#: src/fileio.c:325 +#, c-format +msgid "%s: saved under a different version of Star Traders" +msgstr "%s: lagret under en annen versjon av Star Traders" + +#: src/fileio.c:332 +#, c-format +msgid "%s: saved under an incompatible character encoding" +msgstr "%s: lagret med en inkompatibel tegnkoding" + +#: src/fileio.c:340 +#, c-format +msgid "%s: illegal or missing field on line %d" +msgstr "%s: ulovlig eller manglende felt på linje %d" + +#: src/fileio.c:384 +#, c-format +msgid "%s: illegal field on line %d" +msgstr "%s: ulovlig felt på linje %d" + +#: src/fileio.c:466 src/fileio.c:487 +#, c-format +msgid " Game Not Saved " +msgstr " Spill ikke lagret " + +#: src/fileio.c:467 +#, c-format +msgid "" +"Game %d could not be saved to disk.\n" +"\n" +"^{Directory %s: %s^}" +msgstr "" +"Spillet %d kunne ikke lagres til disk.\n" +"\n" +"^{Mappe %s: %s^}" + +#: src/fileio.c:488 +#, c-format +msgid "" +"Game %d could not be saved to disk.\n" +"\n" +"^{File %s: %s^}" +msgstr "" +"Spillet%d kunne ikke lagres til disken\n" +"\n" +"^{Fil %s: %s^}" + +#. TRANSLATORS: The help text for Star Traders is marked up using a +#. custom mark-up format NOT used anywhere else in the source code. +#. +#. Each string is a single page of text that is displayed in an area 76 +#. columns wide by 16 lines high. Each line is delimited by "\n". NO +#. word-wrapping is performed: you must place the "\n" characters in the +#. appropriate place. Ideally, each line within the string should be +#. also (manually) space-justified or centred. TAB characters and other +#. control codes must NOT be used. If a string starts with "@" as the +#. very first character, that string is ignored (as are all strings +#. following): this allows a variable number of help text pages (from +#. one to ten). Multibyte strings are handled correctly (even those +#. requiring shift sequences!). +#. +#. The ASCII circumflex accent character "^" switches to a different +#. character rendition (also called attributes), depending on the +#. character following the "^": +#. +#. ^^ - Print the circumflex accent (ASCII code U+005E) +#. ^N - Switch to using the normal character rendition +#. ^B - Switch to using the bold character rendition +#. ^H - Switch to using the highlight character rendition +#. ^K - Switch to using the keycode character rendition (such as used for "") +#. ^e - Switch to using the character rendition used for empty space +#. ^o - Switch to using the character rendition used for outposts +#. ^s - Switch to using the character rendition used for stars +#. ^c - Switch to using the character rendition used for companies +#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map +#. +#. The help text parsing routines also understand the following "value +#. escapes" introduced by the ASCII tilde character "~"; these act like +#. "%" conversion specifiers in printf(): +#. +#. ~~ - Print the tilde character (ASCII code U+007E) [*] +#. ~x - Print the width of the galaxy map (MAX_X) [**] +#. ~y - Print the height of the galaxy map (MAX_Y) [**] +#. ~m - Print the number of moves available (NUMBER_MOVES) [**] +#. ~c - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*] +#. ~t - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**] +#. ~1 to ~9 - Print the keycode for the N-th choice of move [***] +#. ~M - Print the keycode for the last choice of move [***] +#. ~A to ~H - Print the character used to represent the company on the galaxy map [***] +#. ~. - Print the character used to represent empty space on the map [***] +#. ~+ - Print the character used to represent outposts on the map [***] +#. ~* - Print the character used to represent stars on the map [***] +#. +#. [*] Takes one character space (column space) in the output +#. [**] Takes two column spaces in the output +#. [***] Takes one or two column spaces in the output, depending on the +#. appropriate strings in the current PO file. +#. +#. Note that all keycodes and map representation characters use locale- +#. specific characters; double-width characters ARE supported. Note +#. also that the tilde value escapes do NOT change the current character +#. rendition: a circumflex accent escape is needed for that. For +#. example, to display the first choice of move as it would be shown on +#. the galaxy map, use something like "^k~1^N" (a six-character sequence +#. that would translate to just one character (or maybe two) in the +#. output text). +#. +#. Formatting the help text is probably the most complicated and tedious +#. part of translating Star Traders. The author and maintainer of this +#. game is more than happy to help you with this task: if you are able +#. to provide a translation, even if it is not formatted correctly, the +#. maintainer will perform the necessary adjustments for word-wrapping +#. and justification. In addition, remember that you have up to 10 +#. pages in which to display your help text: the translation does not +#. need to correspond exactly to the original text. This text will not +#. be changing any time soon! +#. +#: src/help.c:113 +msgid "" +"^BStar Traders^N is a simple game of interstellar trading. The object of the\n" +"game is to amass the greatest amount of wealth possible. This is done by\n" +"creating interstellar shipping lanes, expanding them and buying shares in\n" +"the companies controlling them. Shares appreciate in value as company\n" +"operations expand. In addition, the return on each share (as a percentage)\n" +"also changes. Players may also borrow from the Interstellar Trading Bank to\n" +"finance additional purchases on the Stock Exchange.\n" +"\n" +"The map of the galaxy is represented by a ^B~x^N x ^B~y^N grid. A typical section\n" +"of it may be:\n" +"\n" +" ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N represents ^Bempty space^N,\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N ^s ~* ^N represents a ^Bstar^N.\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" +msgstr "" +"^BStar Traders^N er et enkelt spill med interstellar handel. Målet med\n" +"spillet er å samle størst mulige mengde formue. Dette gjøres ved å\n" +"skape interstellare seilingsleder, utvide dem og kjøpe aksjer i\n" +"selskapene for å kontrollere dem. Aksjer stiger i verdi ettesom selskaps-\n" +"operasjoner utvides. Dessuten, avkastningen på hver del (i prosent)\n" +"endres også. Spillere kan også låne fra Interstellar Handelsbank\n" +"for å finansiere flere kjøp på børsen\n" +"\n" +"Kartet over galaksen er representert ved en^B~x^N x ^B~y^N rutenett. En typisk\n" +"seksjon kan være:\n" +"\n" +" ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N fremstiller ^Btomrom^N,\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N ^s ~* ^N fremstiller en ^Bstjerne^N.\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" + +#: src/help.c:132 +msgid "" +"The computer selects ^B~m^N moves (labeled ^k~1^N to ^k~M^N) at random, and places these\n" +"on the map. To select any of the highlighted positions, press that letter.\n" +"For example, some of the moves on the map may be:\n" +"\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N Moves ^k~1^N to ^k~5^N shown.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" +"\n" +"\n" +"Selecting a position that is ^Bnot^N next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n" +"will set up an ^Boutpost^N, not belonging to any company. Thus, if move ^k~3^N is\n" +"selected on the above map, a ^o ~+ ^N would be placed at that position.\n" +msgstr "" +"Datamaskinen velger ^B~m^N trekk (merket ^k~1^N to ^k~M^N) vilkårlig, og legger disse\n" +"på kartet. Å velge noen av de markerte stedene, trykk på bokstaven.\n" +"For eksempel kan noen av trekkene på kartet være:\n" +"\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N Trekk ^k~1^N til ^k~5^N vist.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" +"\n" +"\n" +"Å velge en posisjon som ^Bikke^N er ved siden av en stjerne (trekk som ^k~1^N, ^k~3^N eller ^k~5^N)\n" +"vil sette opp en ^Butpost^N, som ikke tilhører noe selskap. Slik at hvis trekk ^k~3^N er\n" +"valgt på kartet ovenfor, en ^o ~+ ^N vil bli plassert på den posisjonen.\n" + +#: src/help.c:150 +msgid "" +"If, on the other hand, a position next to a star (or another outpost) is\n" +"selected, a ^Bcompany^N would be formed and its letter would appear on the map.\n" +"As a reward for creating the company, you are granted the first five shares.\n" +"Up to ^B~c^N companies can be created in this way.\n" +"\n" +"If a position next to an existing company is selected, the company would\n" +"expand its operations by one square. This increases the cost of its shares\n" +"and hence your return. Thus, if the map was as shown below, selecting ^k~6^N\n" +"or ^k~8^N increases Company ^B~B^N's shipping lane:\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" +msgstr "" +"Hvis, på den annen side, en posisjon ved siden av en stjerne (eller annet utpost) er\n" +"valgt, vil et ^Bfirma^N bli dannet og dets bokstav vises på kartet.\n" +"Som en belønning for å skape firmaet får du de første fem aksjene.\n" +"Opp til ^B~c^N firmaer kan opprettes på denne måten.\n" +"\n" +"Hvis en posisjon ved siden av et eksisterende selskap er valgt, vli selskapet\n" +"utvide sin virksomhet med én rute. Dette øker kostnadene for sine aksjer\n" +"og dermed avkastningen. Dermed, hvis kartet er som vist nedenfor, velge ^ k ~ 6 ^ N\n" +"eller ^k~8^N øker selskapet ^B~B^N sin skipslei:\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Trekk ^k~6^N eller ^k~8^N øker selskapet ^B~B^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" + +#: src/help.c:168 +msgid "" +"Selecting positions next to stars increases the value of your stock by about\n" +"five times as much as an extension not next to a star. Thus move ^k~6^N should\n" +"be preferred to move ^k~8^N.\n" +"\n" +" ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Move ^k~6^N is preferred to ^k~8^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" +"\n" +"You may also expand any company by selecting positions next to outposts.\n" +"Such outposts will be swallowed up by that company. Thus, move ^k~1^N will\n" +"extend Company ^B~C^N by ^Btwo^N squares. As a bonus, outposts next to stars are\n" +"more valuable: the company's share price will increase by a greater amount\n" +"than it would for outposts not next to stars.\n" +msgstr "" +"Å velge posisjoner ved siden stjerner øker verdien av din beholdning med ca \n" +"fem ganger så mye som en forlengelse ikke ved siden av en stjerne. Derfor bør trekk\n" +"^k~6^N foretrekkes fremfor ^k~8^N.\n" +"\n" +" ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Trekk ^k~6^N foretrekkes fremfor ^k~8^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" +"\n" +"Du kan også utvide ethvert selskap ved å velge posisjoner ved siden av utposter.\n" +"Slike utposter vil bli slukt av det selskapet. Dermed vil trekk ^k~1^N utvide selskapet ^B~C^N\n" +"med ^Bto^N kvadrater. Som en bonus er utposter ved siden av stjernene\n" +"mer verdifulle: selskapets aksjekurs vil øke med en større mengde\n" +"enn det ville gjort for utposter som ikke er ved siden av stjerner.\n" + +#: src/help.c:186 +msgid "" +"If two companies are separated on the map by only one square, then they can\n" +"be ^Bmerged^N into one company by selecting that position (if available). For\n" +"example, on the map below, companies ^B~A^N and ^B~B^N can be merged by selecting ^k~5^N.\n" +"When this occurs, the company with the greater assets value takes over the\n" +"other one. Here, Company ^B~B^N might take over Company ^B~A^N. Company ^B~A^N ceases to\n" +"exist, although it may reappear as an entirely new company at a later stage.\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n" +" ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n" +"\n" +"When companies merge, players are granted shares in the dominant company\n" +"proportional to the amount owned in the old company. As well, a cash bonus\n" +"is also paid, proportional to the percentage of the old company owned.\n" +msgstr "" +"Hvis to selskaper skilles på kartet ved bare én rute, da kan de\n" +"^Bfusjoneres^N i ett selskap ved å velge den posisjonen (hvis tilgjengelig). For\n" +"eksempel, på kartet nedenfor kan bedriftene ^B~A^N og ^B~B^N fusjoneres ved å velge ^k~5^N.\n" +"Når dette skjer tar selskapet med størst aktiva-verdi over det andre.\n" +"Her kan selskapet ^B~B^N ta over selskapet ^B~A^N. Selskapet ^B~A^N opphører å\n" +"eksistere, selv om det kan dukke opp igjen som en helt nytt selskap på et senere tidspunkt.n\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N trekk ^k~5^N fusjonerer selskapene ^B~A^N og ^B~B^N.\n" +" ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n" +"\n" +"Når selskaper fusjonerer blir spillerne tildelt aksjer i det dominerende selskapet\n" +"proporsjonal med mengden eid i det gamle selskapet. en kontantbonus\n" +"blir også betalt, proporsjonal med andelen eid av det gamle selskapet.\n" + +#: src/help.c:205 +msgid "" +"Once you select your move, you enter the ^BInterstellar Stock Exchange^N. Here\n" +"you may purchase shares, sell them, borrow from the Trading Bank or repay\n" +"some of your debt (if applicable). Note that each company issues a limited\n" +"number of shares -- you cannot go on buying for ever! You may, however, bid\n" +"for more shares to be issued. You have a better chance of succeeding if you\n" +"own a larger proportion of the company.\n" +"\n" +"The game usually ends after ^B~t^N turns. However, you may end the game sooner\n" +"by pressing ^K^N when asked to select a move. As well, individual\n" +"players can declare themselves bankrupt at any time. If your debt is large\n" +"enough, the Bank may do this for you! If you do not complete your game in\n" +"the time you have available, you may save the game and continue it later.\n" +"\n" +"\n" +"The ^Bwinner of the game^N is the person with the greatest net worth (total\n" +"value of cash, stock and debt). ^HGood luck^N and may the best person win!\n" +msgstr "" +"Når du har valgt ditt trekk, går du inn i ^BInterstellar Børs^N. Her\n" +"kan du kjøpe aksjer, selge dem, låne fra Handel Bank eller tilbakebetale \n" +"noen av gjelden din (hvis det er aktuelt). Merk at hvert selskap utsteder et begrenset\n" +"antall aksjer - du kan ikke gå på å kjøpe for alltid! Du kan imidlertid by på\n" +"flere aksjer som utstedes. Du har en bedre sjanse for å lykkes hvis du\n" +"eier en større andel av selskapet.\n" +"\n" +"Spillet slutter vanligvis etter ^B~t^N runder. Imidlertid kan du avslutte spillet før\n" +"ved å trykke ^K^N når anmodet om å velge et trekk. Individuelle\n" +"spillere kan erklære seg konkurs når som helst. Hvis gjelden er stor\n" +"nok, kan banken gjøre dette for deg! Hvis du ikke fullfører spillet i\n" +"den tiden du har tilgjengelig, kan du lagre spillet og fortsette senere.\n" +"\n" +"\n" +"^BVinneren av spillet^N er den personen med størst formue (total\n" +"verdi av kontanter, aksjer og gjeld). ^HLykke til^N, må den beste vinne!\n" + +#: src/help.c:225 +msgid "@ Help text, page 7\n" +msgstr "@ Hjelpetekst, side 7\n" + +#: src/help.c:226 +msgid "@ Help text, page 8\n" +msgstr "@ Hjelpetekst, side 8\n" + +#: src/help.c:227 +msgid "@ Help text, page 9\n" +msgstr "@ Hjelpetekst, side 9\n" + +#: src/help.c:228 +msgid "@ Help text, page 10\n" +msgstr "@ Hjelpetekst, side 10\n" + +#: src/help.c:280 +#, c-format +msgid " How to Play " +msgstr " Slik spiller man " + +#. 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 +#, c-format +msgid "Page %d of %d" +msgstr "Side %d av %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 +#, c-format +msgid "[ Press to continue ] " +msgstr "[ Trykk Linjeskift for å fortsette ] " + +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , +#. , , or instead of +#. , and almost any other key instead of +#. (other than , , , , +#. or <\>). +#: src/help.c:494 +#, c-format +msgid "[ Press to continue or for the previous page ] " +msgstr "[Trykk for å fortsette eller for forrige side]" + +#: src/intf.c:110 +#, c-format +msgid "%s: string has incorrect format: `%s'" +msgstr "%s: streng har feil format: «%s»" + +#: src/intf.c:126 +#, c-format +msgid "%s: character has illegal width: `%lc'" +msgstr "%s: tegn har ugyldig bredde «%lc»" + +#: src/intf.c:434 +#, c-format +msgid "terminal size is too small (%d x %d required)" +msgstr "terminal størrelsen er for liten (%d x %d kreves)" + +#: src/intf.c:610 +#, c-format +msgid "Star Traders" +msgstr "Star Traders" + +#: src/intf.c:1265 +#, c-format +msgid "mkchstr_conv: NUL" +msgstr "mkchstr_conv: NUL" + +#: src/intf.c:1568 +#, c-format +msgid "mkchstr: `%s'" +msgstr "mkchstr: «%s»" + +#. TRANSLATORS: This string specifies the keycodes used to insert the +#. default value into the input string, if entered as the very first +#. character. Ideally, it should contain an easily-accessible +#. keycode that would NOT be used in ordinary input. Digits, ".", +#. ",", "+" and "-" are definitely NOT acceptable. +#: src/intf.c:2020 +msgctxt "input|DefaultValue" +msgid "=;" +msgstr "=;" + +#: src/intf.c:2034 src/intf.c:2079 +#, c-format +msgid "gettxline: illegal character in string: `%ls'" +msgstr "gettxline: ugyldig tegn i streng: «%ls»" + +#. TRANSLATORS: The strings with msgctxt "input|Yes" and +#. "input|No" contain the keycodes used to determine whether a +#. user is answering "Yes" or "No" in response to some question. +#. Both upper and lower-case versions should be present. +#: src/intf.c:2952 +msgctxt "input|Yes" +msgid "Yy" +msgstr "Jj" + +#: src/intf.c:2954 +msgctxt "input|No" +msgid "Nn" +msgstr "Nn" + +#. TRANSLATORS: The strings "Yes" and "No" are printed as a +#. response to user input in answer to questions like "Are you +#. sure? [Y/N] " +#: src/intf.c:3005 +msgctxt "answer" +msgid "Yes" +msgstr "Ja" + +#: src/intf.c:3007 +msgctxt "answer" +msgid "No" +msgstr "Nei" + +#: src/utils.c:199 src/utils.c:220 +#, c-format +msgid "%s: " +msgstr "%s: " + +#: src/utils.c:225 +msgid ": " +msgstr ": " + +#: src/utils.c:238 +#, c-format +msgid "out of memory" +msgstr "ikke mer minne" + +#: src/utils.c:571 +#, c-format +msgid "xmbstowcs: `%s'" +msgstr "xmbstowcs: `%s'" + +#: src/utils.c:611 +#, c-format +msgid "xwcrtomb: NUL" +msgstr "xwcrtomb: NUL" + +#: src/utils.c:616 +#, c-format +msgid "xwcrtomb: `%lc'" +msgstr "xwcrtomb: «%lc»" + +#: lib/getopt.c:547 lib/getopt.c:576 +#, c-format +msgid "%s: option '%s' is ambiguous; possibilities:" +msgstr "%s: Valget «%s» er flertydig; muligheter:" + +#: lib/getopt.c:624 lib/getopt.c:628 +#, c-format +msgid "%s: option '--%s' doesn't allow an argument\n" +msgstr "%s: valget «--%s» tillater ikke et argument\n" + +#: lib/getopt.c:637 lib/getopt.c:642 +#, c-format +msgid "%s: option '%c%s' doesn't allow an argument\n" +msgstr "%s: valget «%c%s» tillater ikke argumenter\n" + +#: lib/getopt.c:685 lib/getopt.c:704 +#, c-format +msgid "%s: option '--%s' requires an argument\n" +msgstr "%s: valget «--%s» krever et argument\n" + +#: lib/getopt.c:742 lib/getopt.c:745 +#, c-format +msgid "%s: unrecognized option '--%s'\n" +msgstr "%s: ukjent valg «--%s»\n" + +#: lib/getopt.c:753 lib/getopt.c:756 +#, c-format +msgid "%s: unrecognized option '%c%s'\n" +msgstr "%s: ukjent valg «%c%s»\n" + +#: lib/getopt.c:805 lib/getopt.c:808 +#, c-format +msgid "%s: invalid option -- '%c'\n" +msgstr "%s: ugyldig valg -- «%c»\n" + +#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#, c-format +msgid "%s: option requires an argument -- '%c'\n" +msgstr "%s: valget krever et argument -- «%c»\n" + +#: lib/getopt.c:934 lib/getopt.c:950 +#, c-format +msgid "%s: option '-W %s' is ambiguous\n" +msgstr "%s: valget «-W %s» er flertydig\n" + +#: lib/getopt.c:974 lib/getopt.c:992 +#, c-format +msgid "%s: option '-W %s' doesn't allow an argument\n" +msgstr "%s: valget «-W %s» tillater ikke argumenter\n" + +#: lib/getopt.c:1013 lib/getopt.c:1031 +#, c-format +msgid "%s: option '-W %s' requires an argument\n" +msgstr "%s: valget «-W %s» krever et argument\n" From 9d494716f0c9d903a1659fc4b25934a14c2c417f Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Mon, 5 Nov 2012 20:14:33 +1100 Subject: [PATCH 05/39] Add the Norwegian Bokmaal translation by Johnny A. Solbu --- NEWS | 8 ++++++++ po/LINGUAS | 1 + 2 files changed, 9 insertions(+) diff --git a/NEWS b/NEWS index edaeb54..a2f33dd 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,14 @@ consult the Subversion repository for "trader" on The ZAP Group web server at http://www.zap.org.au/services/svn/. +Version 7.5 (not yet released) +------------------------------ + +Added a translation for Norwegian Bokmaal, with thanks to Johnny A. Solbu. +Updated auxiliary files to the latest versions available from the Gnulib +GNU Portability Library and the GNU Autoconf project. + + Version 7.4 (9th May, 2012) --------------------------- diff --git a/po/LINGUAS b/po/LINGUAS index dff0e8b..09dbc95 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -36,4 +36,5 @@ de fi fr hr +nb ru From 95b94ba6f679f82da79b5d6e7efff2a97d729819 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 6 Nov 2012 21:47:50 +1100 Subject: [PATCH 06/39] =?UTF-8?q?Change=20"Bokmaal"=20to=20"Bokm=C3=A5l",?= =?UTF-8?q?=20the=20correct=20way=20to=20name=20this=20language?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index a2f33dd..212bae2 100644 --- a/NEWS +++ b/NEWS @@ -18,7 +18,7 @@ at http://www.zap.org.au/services/svn/. Version 7.5 (not yet released) ------------------------------ -Added a translation for Norwegian Bokmaal, with thanks to Johnny A. Solbu. +Added a translation for Norwegian Bokmål, with thanks to Johnny A. Solbu. Updated auxiliary files to the latest versions available from the Gnulib GNU Portability Library and the GNU Autoconf project. From 6850f3c71ad65acef2b9ea28d78ac25491d4ebe7 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 6 Nov 2012 21:50:31 +1100 Subject: [PATCH 07/39] Update to the latest version of the GNU Portability Library --- m4/gnulib-cache.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index 958524c..352eeb7 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -66,4 +66,4 @@ gl_LIB([libgnu]) gl_MAKEFILE_NAME([]) gl_MACRO_PREFIX([gl]) gl_PO_DOMAIN([]) -gl_WITNESS_C_DOMAIN([]) +gl_WITNESS_C_MACRO([]) From be9da45d46c5394d2e1fee061baed69ccb43d164 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 6 Nov 2012 21:52:24 +1100 Subject: [PATCH 08/39] =?UTF-8?q?Update=20the=20Norwegian=20Bokm=C3=A5l=20?= =?UTF-8?q?translation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change whitespacing and word-wrapping of the help text, change the case of certain strings, add the standard header comment and make other small changes to the translated text. --- po/nb.po | 206 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 107 insertions(+), 99 deletions(-) diff --git a/po/nb.po b/po/nb.po index cc9632c..61b3692 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,15 +1,21 @@ -# Norwegian Bokmal translations for trader package. -# Copyright (C) 2012 John Zaitseff +# ************************************************************************* +# * * +# * Norwegian Bokmål Translations for Star Traders * +# * Copyright (C) 2012, John Zaitseff * +# * * +# ************************************************************************* +# # This file is distributed under the same license as the trader package. # -# Johnny A. Solbu , 2012. +# Contributors: +# Johnny A. Solbu , 2012. # msgid "" msgstr "" "Project-Id-Version: trader 7.4\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-11-05 20:12+1100\n" -"PO-Revision-Date: 2012-11-05 07:46+0100\n" +"PO-Revision-Date: 2012-11-06 21:44+1100\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" @@ -21,7 +27,7 @@ msgstr "" #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: `%s'\n" -msgstr "%s: ugyldig verdi for --max-turn «%s»\n" +msgstr "%s: ugyldig verdi for --max-turn: «%s»\n" #: src/trader.c:251 #, c-format @@ -31,7 +37,7 @@ msgstr "%s: ugyldig operand «%s»\n" #: src/trader.c:260 #, c-format msgid "%s: invalid game number `%s'\n" -msgstr "%s: Ugyldig spillnummer «%s»\n" +msgstr "%s: ugyldig spillnummer «%s»\n" #: src/trader.c:269 #, c-format @@ -57,16 +63,17 @@ msgid "" "NO WARRANTY, to the extent permitted by law; see the License for details.\n" msgstr "" "Star Traders (%s) %s\n" -"Opphavsrett (C)%s, John Zaitseff.\n" +"Opphavsrett (C) %s, John Zaitseff.\n" "\n" -"Star Traders er et enkelt spill med interstellar handel, der målet\n" -"med spillet er å opprette firmaer, kjøpe og selge aksjer, låne og betale tilbake\n" -"penger for å bli den rikeste spilleren (vinneren).\n" +"Star Traders er et enkelt spill med interstellar handel, der målet med\n" +"spillet er å opprette firmaer, kjøpe og selge aksjer, låne og betale\n" +"tilbake penger for å bli den rikeste spilleren (vinneren).\n" "\n" -"Dette programmet er Fri programvare som distribueres under vilkårene i\n" -"GNU General Public License, versjon 3 eller nyere. Du er velkommen til å\n" -"endre og / eller distribuere det under visse betingelser. Dette programmet har\n" -"INGEN GARANTI i den grad loven tillater, se lisens for detaljer.\n" +"Dette programmet er Fri programvare som distribueres under vilkårene\n" +"i GNU General Public License, versjon 3 eller nyere. Du er velkommen\n" +"til å endre og / eller distribuere det under visse betingelser. Dette\n" +"programmet har INGEN GARANTI i den grad loven tillater, se lisens for\n" +"detaljer.\n" #: src/trader.c:308 #, c-format @@ -76,7 +83,7 @@ msgstr "%s: Prøv «%s --help» for mer informasjon.\n" #: src/trader.c:311 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" -msgstr "Bruksmåte: %s [VALG]... FIL...\n" +msgstr "Bruksmåte: %s [VALG ...] [SPILL]\n" #: src/trader.c:312 #, c-format @@ -100,7 +107,7 @@ msgstr "" "Valg:\n" " -V, --version vis versjonsinformasjon og avslutt\n" " -h, --help vis denne hjelpen og avslutte\n" -" --no-color Ikke bruk farger for visning av tekst\n" +" --no-color ikke bruk farger for visning av tekst\n" " --max-turn=NUM sette antall runder til NUM\n" "\n" @@ -288,7 +295,7 @@ msgstr "Spilleren som begynner er ^{%ls^}." #: src/game.c:259 #, c-format msgid "Enter number of players [^{1^}-^{%d^}] or ^{^} to continue a game: " -msgstr "Angi antall spillere [^{1^}-^{%d^}] eller ^{^} for å fortsette et spill: " +msgstr "Angi antall spillere [^{1^}-^{%d^}] eller ^{^} for å fortsette et spill: " #. TRANSLATORS: This string specifies the keycodes used to continue a #. game; these must NOT contain any numeric digit from 1 to 9. The @@ -303,7 +310,7 @@ msgstr "Cc" #: src/game.c:341 src/move.c:399 #, c-format msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " -msgstr "Tast inn spill nummer [^{1^}-^{9^}] eller ^{^} for å avbryte: " +msgstr "Tast inn spill nummer [^{1^}-^{9^}] eller ^{^} for å avbryte: " #: src/game.c:406 #, c-format @@ -340,7 +347,7 @@ msgstr " Spillet er slutt " msgid "The game is over after one turn." msgid_plural "The game is over after %d turns." msgstr[0] "Spillet er over etter en runde." -msgstr[1] "Spillet er over etter% d runder." +msgstr[1] "Spillet er over etter %d runder." #: src/game.c:575 #, c-format @@ -368,7 +375,7 @@ msgid "" "with a value of ^{%N^}." msgstr "" "Vinneren er ^{%ls^}\n" -"med en verdi på^{%N^}." +"med en verdi på ^{%N^}." #: src/game.c:597 #, c-format @@ -509,25 +516,25 @@ msgstr "" #, c-format msgctxt "label" msgid "Total value: " -msgstr "Total verdi: " +msgstr "Total verdi: " #: src/game.c:800 src/exch.c:324 #, c-format msgctxt "label" msgid "Current cash: " -msgstr "Nåværende kontanter: " +msgstr "Nåværende kontanter: " #: src/game.c:807 src/exch.c:332 #, c-format msgctxt "label" msgid "Current debt: " -msgstr "eksisterende gjeld: " +msgstr "Eksisterende gjeld: " #: src/game.c:813 src/exch.c:337 #, c-format msgctxt "label" msgid "Interest rate: " -msgstr "Rentesats: " +msgstr "Rentesats: " #. TRANSLATORS: Each label may be up to 37 characters wide #. (for <1> and <2>) or 38 characters wide (for <3> and @@ -593,7 +600,7 @@ msgstr "^{^} (Avslutt spillet)" #: src/move.c:361 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " -msgstr "Er du sikker? [^{Y^}/^{N^}] " +msgstr "Er du sikker? [^{J^}/^{N^}] " #: src/move.c:378 src/move.c:456 #, c-format @@ -629,7 +636,7 @@ msgid "" "Its name is ^{%ls^}." msgstr "" "Et nytt firma er opprettet!\n" -"Navnet er ^{%ls^}." +"Navnet er ^{%ls^}." #: src/move.c:824 #, c-format @@ -664,7 +671,7 @@ msgstr "Gamle aksjer: " #, c-format msgctxt "label" msgid "New Stock: " -msgstr " Nye aksjer: " +msgstr "Nye aksjer: " #. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to #. each player after two companies merge. %ls is the currency @@ -727,7 +734,7 @@ msgid "" msgstr "" "%ls er erklært konkurs av Interstellar Handelsbank.\n" "\n" -"^{Banken har avtalt å betale aksjonærer ^}%.2f%%^{av aksjeverdien på hver aksje.^}" +"^{Banken har avtalt å betale aksjonærer ^}%.2f%%^{ av aksjeverdien på hver aksje.^}" #. TRANSLATORS: The label "Amount paid per share" #. refers to payment made by the Interstellar @@ -741,7 +748,7 @@ msgstr "" #, c-format msgctxt "label" msgid "Amount paid per share: " -msgstr "Betalt beløp per aksje:" +msgstr "Betalt beløp per aksje: " #. TRANSLATORS: "Old share value" refers to the #. share price of a company before it was forced @@ -751,12 +758,12 @@ msgstr "Betalt beløp per aksje:" #, c-format msgctxt "label" msgid "Old share value: " -msgstr "Gammel aksjeverdi: " +msgstr "Gammel aksjeverdi: " #: src/move.c:1197 src/move.c:1232 src/exch.c:321 #, c-format msgid " Interstellar Trading Bank " -msgstr "Interstellar handelsbank " +msgstr " Interstellar Handelsbank " #: src/move.c:1199 #, c-format @@ -779,7 +786,7 @@ msgstr "" #: src/exch.c:98 #, c-format msgid " Interstellar Stock Exchange " -msgstr "Interstellar børs " +msgstr " Interstellar Børs " #. TRANSLATORS: "Shares left" is a two-line column #. label in a table containing the number of shares @@ -846,7 +853,7 @@ msgstr "Angi valg [^[Firmabrev^]/^{1^}-^{4^}]: " #, c-format msgctxt "label" msgid "Credit limit: " -msgstr "Kredittgrense: " +msgstr "Kredittgrense: " #. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit #. from the Bank" menu options must all be the same length @@ -855,12 +862,12 @@ msgstr "Kredittgrense: " #: src/exch.c:366 #, c-format msgid "^{<1>^} Borrow money " -msgstr "^{<1>^} Låne penger " +msgstr "^{<1>^} Låne penger " #: src/exch.c:368 #, c-format msgid "^{<2>^} Repay debt " -msgstr "^{<2>^} Nedbetal gjeld " +msgstr "^{<2>^} Nedbetal gjeld " #: src/exch.c:370 #, c-format @@ -885,7 +892,7 @@ msgstr "Banken vil ikke låne deg mer penger." #: src/exch.c:447 #, c-format msgid "How much do you wish to borrow? " -msgstr "Hvor mye ønsker du å låne? " +msgstr "Hvor mye ønsker du å låne? " #: src/exch.c:479 #, c-format @@ -930,7 +937,7 @@ msgstr " Aksjetransaksjon for %ls " #, c-format msgctxt "label|Stock A" msgid "Shares issued: " -msgstr "Aksjer utstedt: " +msgstr "Aksjer utstedt: " #. TRANSLATORS: "Shares left" is the number of shares that are #. left to be purchased in the current company. @@ -938,7 +945,7 @@ msgstr "Aksjer utstedt: " #, c-format msgctxt "label|Stock A" msgid "Shares left: " -msgstr "Aksjer igjen: " +msgstr "Aksjer igjen: " #. TRANSLATORS: "Price per share" is the cost of each share in #. the current company. @@ -946,7 +953,7 @@ msgstr "Aksjer igjen: " #, c-format msgctxt "label|Stock A" msgid "Price per share: " -msgstr "Pris per aksje:" +msgstr "Pris per aksje: " #. TRANSLATORS: "Return" is the share return as a percentage. #: src/exch.c:613 @@ -967,7 +974,7 @@ msgstr "Utbytte: " #, c-format msgctxt "label|Stock B" msgid "Current holdings: " -msgstr "Nåværende aksjepost: " +msgstr "Nåværende aksjepost: " #. TRANSLATORS: "Percentage owned" is the current player's #. percentage ownership in this particular company. @@ -975,13 +982,13 @@ msgstr "Nåværende aksjepost: " #, c-format msgctxt "label|Stock B" msgid "Percentage owned: " -msgstr "Eierandel: " +msgstr "Eierandel: " #: src/exch.c:638 #, c-format msgctxt "label|Stock B" msgid "Current cash: " -msgstr "Nåværende kontanter: " +msgstr "Nåværende kontanter: " #. TRANSLATORS: Each label may be up to 35 characters wide #. (for <1> and <2>) or 36 characters wide (for <3> and <4>). @@ -1156,7 +1163,7 @@ msgid "" "\n" "^{File %s: %s^}" msgstr "" -"Spillet %d kunne ikke lastes fra disk\n" +"Spillet %d kunne ikke lastes fra disk.\n" "\n" "^{Fil %s: %s^}" @@ -1218,7 +1225,7 @@ msgid "" "\n" "^{File %s: %s^}" msgstr "" -"Spillet%d kunne ikke lagres til disken\n" +"Spillet %d kunne ikke lagres til disken.\n" "\n" "^{Fil %s: %s^}" @@ -1311,16 +1318,15 @@ msgid "" " ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" msgstr "" -"^BStar Traders^N er et enkelt spill med interstellar handel. Målet med\n" -"spillet er å samle størst mulige mengde formue. Dette gjøres ved å\n" -"skape interstellare seilingsleder, utvide dem og kjøpe aksjer i\n" -"selskapene for å kontrollere dem. Aksjer stiger i verdi ettesom selskaps-\n" -"operasjoner utvides. Dessuten, avkastningen på hver del (i prosent)\n" -"endres også. Spillere kan også låne fra Interstellar Handelsbank\n" -"for å finansiere flere kjøp på børsen\n" +"^BStar Traders^N er et enkelt spill med interstellar handel. Målet med spillet\n" +"er å samle størst mulige mengde formue. Dette gjøres ved å skape interstel-\n" +"lare seilingsleder, utvide dem og kjøpe aksjer i selskapene for å kontrol-\n" +"lere dem. Aksjer stiger i verdi ettesom selskaps-operasjoner utvides. Des-\n" +"suten, avkastningen på hver del (i prosent) endres også. Spillere kan også\n" +"låne fra Interstellar Handelsbank for å finansiere flere kjøp på børsen.\n" "\n" -"Kartet over galaksen er representert ved en^B~x^N x ^B~y^N rutenett. En typisk\n" -"seksjon kan være:\n" +"Kartet over galaksen er representert ved en ^B~x^N x ^B~y^N rutenett. En typisk sek-\n" +"sjon kan være:\n" "\n" " ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N fremstiller ^Btomrom^N,\n" @@ -1346,9 +1352,9 @@ msgid "" "will set up an ^Boutpost^N, not belonging to any company. Thus, if move ^k~3^N is\n" "selected on the above map, a ^o ~+ ^N would be placed at that position.\n" msgstr "" -"Datamaskinen velger ^B~m^N trekk (merket ^k~1^N to ^k~M^N) vilkårlig, og legger disse\n" -"på kartet. Å velge noen av de markerte stedene, trykk på bokstaven.\n" -"For eksempel kan noen av trekkene på kartet være:\n" +"Datamaskinen velger ^B~m^N trekk (merket ^k~1^N to ^k~M^N) vilkårlig, og legger disse på\n" +"kartet. Å velge noen av de markerte stedene, trykk på bokstaven. For eksem-\n" +"pel kan noen av trekkene på kartet være:\n" "\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1358,9 +1364,10 @@ msgstr "" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" "\n" "\n" -"Å velge en posisjon som ^Bikke^N er ved siden av en stjerne (trekk som ^k~1^N, ^k~3^N eller ^k~5^N)\n" -"vil sette opp en ^Butpost^N, som ikke tilhører noe selskap. Slik at hvis trekk ^k~3^N er\n" -"valgt på kartet ovenfor, en ^o ~+ ^N vil bli plassert på den posisjonen.\n" +"Å velge en posisjon som ^Bikke^N er ved siden av en stjerne (trekk som ^k~1^N, ^k~3^N\n" +"eller ^k~5^N) vil sette opp en ^Butpost^N, som ikke tilhører noe selskap. Slik at\n" +"hvis trekk ^k~3^N er valgt på kartet ovenfor, en ^o ~+ ^N vil bli plassert på den\n" +"posisjonen.\n" #: src/help.c:150 msgid "" @@ -1380,15 +1387,15 @@ msgid "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" msgstr "" -"Hvis, på den annen side, en posisjon ved siden av en stjerne (eller annet utpost) er\n" -"valgt, vil et ^Bfirma^N bli dannet og dets bokstav vises på kartet.\n" -"Som en belønning for å skape firmaet får du de første fem aksjene.\n" -"Opp til ^B~c^N firmaer kan opprettes på denne måten.\n" +"Hvis, på den annen side, en posisjon ved siden av en stjerne (eller annet\n" +"utpost) er valgt, vil et ^Bfirma^N bli dannet og dets bokstav vises på kartet.\n" +"Som en belønning for å skape firmaet får du de første fem aksjene. Opp til\n" +"^B~c^N firmaer kan opprettes på denne måten.\n" "\n" -"Hvis en posisjon ved siden av et eksisterende selskap er valgt, vli selskapet\n" -"utvide sin virksomhet med én rute. Dette øker kostnadene for sine aksjer\n" -"og dermed avkastningen. Dermed, hvis kartet er som vist nedenfor, velge ^ k ~ 6 ^ N\n" -"eller ^k~8^N øker selskapet ^B~B^N sin skipslei:\n" +"Hvis en posisjon ved siden av et eksisterende selskap er valgt, vil sels-\n" +"kapet utvide sin virksomhet med én rute. Dette øker kostnadene for sine\n" +"aksjer og dermed avkastningen. Dermed, hvis kartet er som vist nedenfor,\n" +"velge ^k~6^N eller ^k~8^N øker selskapet ^B~B^N sin skipslei:\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" @@ -1414,9 +1421,9 @@ msgid "" "more valuable: the company's share price will increase by a greater amount\n" "than it would for outposts not next to stars.\n" msgstr "" -"Å velge posisjoner ved siden stjerner øker verdien av din beholdning med ca \n" -"fem ganger så mye som en forlengelse ikke ved siden av en stjerne. Derfor bør trekk\n" -"^k~6^N foretrekkes fremfor ^k~8^N.\n" +"Å velge posisjoner ved siden stjerner øker verdien av din beholdning med ca\n" +"fem ganger så mye som en forlengelse ikke ved siden av en stjerne. Derfor\n" +"bør trekk ^k~6^N foretrekkes fremfor ^k~8^N.\n" "\n" " ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" @@ -1424,10 +1431,10 @@ msgstr "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" "\n" -"Du kan også utvide ethvert selskap ved å velge posisjoner ved siden av utposter.\n" -"Slike utposter vil bli slukt av det selskapet. Dermed vil trekk ^k~1^N utvide selskapet ^B~C^N\n" -"med ^Bto^N kvadrater. Som en bonus er utposter ved siden av stjernene\n" -"mer verdifulle: selskapets aksjekurs vil øke med en større mengde\n" +"Du kan også utvide ethvert selskap ved å velge posisjoner ved siden av\n" +"utposter. Slike utposter vil bli slukt av det selskapet. Dermed vil trekk ^k~1^N\n" +"utvide selskapet ^B~C^N med ^Bto^N kvadrater. Som en bonus er utposter ved siden av\n" +"stjernene mer verdifulle: selskapets aksjekurs vil øke med en større mengde\n" "enn det ville gjort for utposter som ikke er ved siden av stjerner.\n" #: src/help.c:186 @@ -1449,21 +1456,22 @@ msgid "" "proportional to the amount owned in the old company. As well, a cash bonus\n" "is also paid, proportional to the percentage of the old company owned.\n" msgstr "" -"Hvis to selskaper skilles på kartet ved bare én rute, da kan de\n" -"^Bfusjoneres^N i ett selskap ved å velge den posisjonen (hvis tilgjengelig). For\n" -"eksempel, på kartet nedenfor kan bedriftene ^B~A^N og ^B~B^N fusjoneres ved å velge ^k~5^N.\n" -"Når dette skjer tar selskapet med størst aktiva-verdi over det andre.\n" -"Her kan selskapet ^B~B^N ta over selskapet ^B~A^N. Selskapet ^B~A^N opphører å\n" -"eksistere, selv om det kan dukke opp igjen som en helt nytt selskap på et senere tidspunkt.n\n" +"Hvis to selskaper skilles på kartet ved bare én rute, da kan de ^Bfusjoneres^N i\n" +"ett selskap ved å velge den posisjonen (hvis tilgjengelig). For eksempel, på\n" +"kartet nedenfor kan bedriftene ^B~A^N og ^B~B^N fusjoneres ved å velge ^k~5^N. Når dette\n" +"skjer tar selskapet med størst aktiva-verdi over det andre. Her kan sels-\n" +"kapet ^B~B^N ta over selskapet ^B~A^N. Selskapet ^B~A^N opphører å eksistere, selv om det\n" +"kan dukke opp igjen som en helt nytt selskap på et senere tidspunkt.\n" +"\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n" " ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N trekk ^k~5^N fusjonerer selskapene ^B~A^N og ^B~B^N.\n" " ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n" "\n" -"Når selskaper fusjonerer blir spillerne tildelt aksjer i det dominerende selskapet\n" -"proporsjonal med mengden eid i det gamle selskapet. en kontantbonus\n" -"blir også betalt, proporsjonal med andelen eid av det gamle selskapet.\n" +"Når selskaper fusjonerer blir spillerne tildelt aksjer i det dominerende\n" +"selskapet proporsjonal med mengden eid i det gamle selskapet. En kontant-\n" +"bonus blir også betalt, proporsjonal med andelen eid av det gamle selskapet.\n" #: src/help.c:205 msgid "" @@ -1484,22 +1492,22 @@ msgid "" "The ^Bwinner of the game^N is the person with the greatest net worth (total\n" "value of cash, stock and debt). ^HGood luck^N and may the best person win!\n" msgstr "" -"Når du har valgt ditt trekk, går du inn i ^BInterstellar Børs^N. Her\n" -"kan du kjøpe aksjer, selge dem, låne fra Handel Bank eller tilbakebetale \n" -"noen av gjelden din (hvis det er aktuelt). Merk at hvert selskap utsteder et begrenset\n" -"antall aksjer - du kan ikke gå på å kjøpe for alltid! Du kan imidlertid by på\n" -"flere aksjer som utstedes. Du har en bedre sjanse for å lykkes hvis du\n" +"Når du har valgt ditt trekk, går du inn i ^BInterstellar Børs^N. Her kan du\n" +"kjøpe aksjer, selge dem, låne fra Handel Bank eller tilbakebetale noen av\n" +"gjelden din (hvis det er aktuelt). Merk at hvert selskap utsteder et begren-\n" +"set antall aksjer — du kan ikke gå på å kjøpe for alltid! Du kan imidlertid\n" +"by på flere aksjer som utstedes. Du har en bedre sjanse for å lykkes hvis du\n" "eier en større andel av selskapet.\n" "\n" -"Spillet slutter vanligvis etter ^B~t^N runder. Imidlertid kan du avslutte spillet før\n" -"ved å trykke ^K^N når anmodet om å velge et trekk. Individuelle\n" -"spillere kan erklære seg konkurs når som helst. Hvis gjelden er stor\n" -"nok, kan banken gjøre dette for deg! Hvis du ikke fullfører spillet i\n" -"den tiden du har tilgjengelig, kan du lagre spillet og fortsette senere.\n" +"Spillet slutter vanligvis etter ^B~t^N runder. Imidlertid kan du avslutte spil-\n" +"let før ved å trykke ^K^N når anmodet om å velge et trekk. Individuelle\n" +"spillere kan erklære seg konkurs når som helst. Hvis gjelden er stor nok,\n" +"kan banken gjøre dette for deg! Hvis du ikke fullfører spillet i den tiden\n" +"du har tilgjengelig, kan du lagre spillet og fortsette senere.\n" "\n" "\n" -"^BVinneren av spillet^N er den personen med størst formue (total\n" -"verdi av kontanter, aksjer og gjeld). ^HLykke til^N, må den beste vinne!\n" +"^BVinneren av spillet^N er den personen med størst formue (total verdi av kon-\n" +"tanter, aksjer og gjeld). ^HLykke til^N, må den beste vinne!\n" #: src/help.c:225 msgid "@ Help text, page 7\n" @@ -1548,7 +1556,7 @@ msgstr "[ Trykk Linjeskift for å fortsette ] " #: src/help.c:494 #, c-format msgid "[ Press to continue or for the previous page ] " -msgstr "[Trykk for å fortsette eller for forrige side]" +msgstr "[ Trykk Linjeskrift for å fortsette eller for forrige side ] " #: src/intf.c:110 #, c-format @@ -1558,7 +1566,7 @@ msgstr "%s: streng har feil format: «%s»" #: src/intf.c:126 #, c-format msgid "%s: character has illegal width: `%lc'" -msgstr "%s: tegn har ugyldig bredde «%lc»" +msgstr "%s: tegn har ugyldig bredde: «%lc»" #: src/intf.c:434 #, c-format @@ -1639,7 +1647,7 @@ msgstr "ikke mer minne" #: src/utils.c:571 #, c-format msgid "xmbstowcs: `%s'" -msgstr "xmbstowcs: `%s'" +msgstr "xmbstowcs: «%s»" #: src/utils.c:611 #, c-format @@ -1654,7 +1662,7 @@ msgstr "xwcrtomb: «%lc»" #: lib/getopt.c:547 lib/getopt.c:576 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: Valget «%s» er flertydig; muligheter:" +msgstr "%s: valget «%s» er flertydig; muligheter:" #: lib/getopt.c:624 lib/getopt.c:628 #, c-format From 8a7c9de7bb5b4850e09e85a6fa765e1364f00f06 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Wed, 7 Nov 2012 20:09:44 +1100 Subject: [PATCH 09/39] Update nb.po to the latest version available from TP --- po/nb.po | 232 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 123 insertions(+), 109 deletions(-) diff --git a/po/nb.po b/po/nb.po index 1dfcdbe..f7c504e 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,18 +1,24 @@ -# Norwegian Bokmal translations for trader package. -# Copyright (C) 2012 John Zaitseff +# ************************************************************************* +# * * +# * Norwegian Bokmål Translations for Star Traders * +# * Copyright (C) 2012, John Zaitseff * +# * * +# ************************************************************************* +# # This file is distributed under the same license as the trader package. # -# Johnny A. Solbu , 2012. +# Contributors: +# Johnny A. Solbu , 2012. # msgid "" msgstr "" "Project-Id-Version: trader 7.4\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 13:57+1000\n" -"PO-Revision-Date: 2012-11-05 07:46+0100\n" +"PO-Revision-Date: 2012-11-06 16:05+0100\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" -"Language: nb_NO\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -21,7 +27,7 @@ msgstr "" #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: `%s'\n" -msgstr "%s: ugyldig verdi for --max-turn «%s»\n" +msgstr "%s: ugyldig verdi for --max-turn: «%s»\n" #: src/trader.c:251 #, c-format @@ -31,7 +37,7 @@ msgstr "%s: ugyldig operand «%s»\n" #: src/trader.c:260 #, c-format msgid "%s: invalid game number `%s'\n" -msgstr "%s: Ugyldig spillnummer «%s»\n" +msgstr "%s: ugyldig spillnummer «%s»\n" #: src/trader.c:269 #, c-format @@ -57,16 +63,17 @@ msgid "" "NO WARRANTY, to the extent permitted by law; see the License for details.\n" msgstr "" "Star Traders (%s) %s\n" -"Opphavsrett (C)%s, John Zaitseff.\n" +"Opphavsrett (C) %s, John Zaitseff.\n" "\n" -"Star Traders er et enkelt spill med interstellar handel, der målet\n" -"med spillet er å opprette firmaer, kjøpe og selge aksjer, låne og betale tilbake\n" -"penger for å bli den rikeste spilleren (vinneren).\n" +"Star Traders er et enkelt spill med interstellar handel, der målet med\n" +"spillet er å opprette firmaer, kjøpe og selge aksjer, låne og betale\n" +"tilbake penger for å bli den rikeste spilleren (vinneren).\n" "\n" -"Dette programmet er Fri programvare som distribueres under vilkårene i\n" -"GNU General Public License, versjon 3 eller nyere. Du er velkommen til å\n" -"endre og / eller distribuere det under visse betingelser. Dette programmet har\n" -"INGEN GARANTI i den grad loven tillater, se lisens for detaljer.\n" +"Dette programmet er Fri programvare som distribueres under vilkårene\n" +"i GNU General Public License, versjon 3 eller nyere. Du er velkommen\n" +"til å endre og / eller distribuere det under visse betingelser. Dette\n" +"programmet har INGEN GARANTI i den grad loven tillater, se lisens for\n" +"detaljer.\n" #: src/trader.c:308 #, c-format @@ -76,7 +83,7 @@ msgstr "%s: Prøv «%s --help» for mer informasjon.\n" #: src/trader.c:311 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" -msgstr "Bruksmåte: %s [VALG]... FIL...\n" +msgstr "Bruksmåte: %s [VALG ...] [SPILL]\n" #: src/trader.c:312 #, c-format @@ -99,8 +106,8 @@ msgid "" msgstr "" "Valg:\n" " -V, --version vis versjonsinformasjon og avslutt\n" -" -h, --help vis denne hjelpen og avslutte\n" -" --no-color Ikke bruk farger for visning av tekst\n" +" -h, --help vis denne hjelpen og avslutt\n" +" --no-color ikke bruk farger for visning av tekst\n" " --max-turn=NUM sette antall runder til NUM\n" "\n" @@ -124,7 +131,10 @@ msgstr "" #: src/trader.c:334 #, c-format msgid "Report bugs to %s <%s>.\n" -msgstr "Rapporter feil til %s <%s>.\n" +msgstr "" +"Rapporter feil, på engelsk, til %s <%s>.\n" +"Oversettelsesfeil kan rapporteres til\n" +"\n" #. TRANSLATORS: %s is the e-mail address for reporting bugs. As #. with the previous string, please add ANOTHER line with the @@ -134,7 +144,10 @@ msgstr "Rapporter feil til %s <%s>.\n" #: src/trader.c:341 #, c-format msgid "Report bugs to <%s>.\n" -msgstr "Rapporter feil til <%s>.\n" +msgstr "" +"Rapporter feil, på engelsk, til <%s>.\n" +"Oversettelsesfeil kan rapporteres til\n" +"\n" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". @@ -160,11 +173,11 @@ msgstr "Altair Starways" #: src/globals.c:48 msgid "Betelgeuse, Ltd" -msgstr "Betelgeuse, Ltd" +msgstr "Betelgeuse, A/S" #: src/globals.c:49 msgid "Capella Freight Co" -msgstr "Capella Freight Co" +msgstr "Capella Freight A/S" #: src/globals.c:50 msgid "Denebola Shippers" @@ -180,7 +193,7 @@ msgstr "Fornax Express" #: src/globals.c:53 msgid "Gemeni Inc" -msgstr "Gemeni Inc" +msgstr "Gemeni A/S" #: src/globals.c:54 msgid "Hercules and Co" @@ -288,7 +301,7 @@ msgstr "Spilleren som begynner er ^{%ls^}." #: src/game.c:259 #, c-format msgid "Enter number of players [^{1^}-^{%d^}] or ^{^} to continue a game: " -msgstr "Angi antall spillere [^{1^}-^{%d^}] eller ^{^} for å fortsette et spill: " +msgstr "Angi antall spillere [^{1^}-^{%d^}] eller ^{^} for å fortsette et spill: " #. TRANSLATORS: This string specifies the keycodes used to continue a #. game; these must NOT contain any numeric digit from 1 to 9. The @@ -298,12 +311,12 @@ msgstr "Angi antall spillere [^{1^}-^{%d^}] eller ^{^} for å fortsette et sp #: src/game.c:276 msgctxt "input|ContinueGame" msgid "Cc" -msgstr "Cc" +msgstr "Ff" #: src/game.c:341 src/move.c:399 #, c-format msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " -msgstr "Tast inn spill nummer [^{1^}-^{9^}] eller ^{^} for å avbryte: " +msgstr "Tast inn spill nummer [^{1^}-^{9^}] eller ^{^} for å avbryte: " #: src/game.c:406 #, c-format @@ -340,7 +353,7 @@ msgstr " Spillet er slutt " msgid "The game is over after one turn." msgid_plural "The game is over after %d turns." msgstr[0] "Spillet er over etter en runde." -msgstr[1] "Spillet er over etter% d runder." +msgstr[1] "Spillet er over etter %d runder." #: src/game.c:575 #, c-format @@ -368,7 +381,7 @@ msgid "" "with a value of ^{%N^}." msgstr "" "Vinneren er ^{%ls^}\n" -"med en verdi på^{%N^}." +"med en verdi på ^{%N^}." #: src/game.c:597 #, c-format @@ -509,25 +522,25 @@ msgstr "" #, c-format msgctxt "label" msgid "Total value: " -msgstr "Total verdi: " +msgstr "Total verdi: " #: src/game.c:800 src/exch.c:324 #, c-format msgctxt "label" msgid "Current cash: " -msgstr "Nåværende kontanter: " +msgstr "Nåværende kontanter: " #: src/game.c:807 src/exch.c:332 #, c-format msgctxt "label" msgid "Current debt: " -msgstr "eksisterende gjeld: " +msgstr "Eksisterende gjeld: " #: src/game.c:813 src/exch.c:337 #, c-format msgctxt "label" msgid "Interest rate: " -msgstr "Rentesats: " +msgstr "Rentesats: " #. TRANSLATORS: Each label may be up to 37 characters wide #. (for <1> and <2>) or 38 characters wide (for <3> and @@ -593,7 +606,7 @@ msgstr "^{^} (Avslutt spillet)" #: src/move.c:361 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " -msgstr "Er du sikker? [^{Y^}/^{N^}] " +msgstr "Er du sikker? [^{J^}/^{N^}] " #: src/move.c:378 src/move.c:456 #, c-format @@ -629,7 +642,7 @@ msgid "" "Its name is ^{%ls^}." msgstr "" "Et nytt firma er opprettet!\n" -"Navnet er ^{%ls^}." +"Navnet er ^{%ls^}." #: src/move.c:824 #, c-format @@ -664,7 +677,7 @@ msgstr "Gamle aksjer: " #, c-format msgctxt "label" msgid "New Stock: " -msgstr " Nye aksjer: " +msgstr "Nye aksjer: " #. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to #. each player after two companies merge. %ls is the currency @@ -727,7 +740,7 @@ msgid "" msgstr "" "%ls er erklært konkurs av Interstellar Handelsbank.\n" "\n" -"^{Banken har avtalt å betale aksjonærer ^}%.2f%%^{av aksjeverdien på hver aksje.^}" +"^{Banken har avtalt å betale aksjonærer ^}%.2f%%^{ av aksjeverdien på hver aksje.^}" #. TRANSLATORS: The label "Amount paid per share" #. refers to payment made by the Interstellar @@ -741,7 +754,7 @@ msgstr "" #, c-format msgctxt "label" msgid "Amount paid per share: " -msgstr "Betalt beløp per aksje:" +msgstr "Betalt beløp per aksje: " #. TRANSLATORS: "Old share value" refers to the #. share price of a company before it was forced @@ -751,12 +764,12 @@ msgstr "Betalt beløp per aksje:" #, c-format msgctxt "label" msgid "Old share value: " -msgstr "Gammel aksjeverdi: " +msgstr "Gammel aksjeverdi: " #: src/move.c:1197 src/move.c:1232 src/exch.c:321 #, c-format msgid " Interstellar Trading Bank " -msgstr "Interstellar handelsbank " +msgstr " Interstellar Handelsbank " #: src/move.c:1199 #, c-format @@ -773,13 +786,13 @@ msgid "" "Your debt has amounted to %N!\n" "^{The Bank has impounded ^}%N^{ from your cash.^}" msgstr "" -"Din gjeld har utgjort %N!\n" +"Gjelden din er kommet opp i %N!\n" "^{Banken har beslaglagt ^}%N^{ fra kontantbeholdningen.^}" #: src/exch.c:98 #, c-format msgid " Interstellar Stock Exchange " -msgstr "Interstellar børs " +msgstr " Interstellar Børs " #. TRANSLATORS: "Shares left" is a two-line column #. label in a table containing the number of shares @@ -846,7 +859,7 @@ msgstr "Angi valg [^[Firmabrev^]/^{1^}-^{4^}]: " #, c-format msgctxt "label" msgid "Credit limit: " -msgstr "Kredittgrense: " +msgstr "Kredittgrense: " #. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit #. from the Bank" menu options must all be the same length @@ -855,12 +868,12 @@ msgstr "Kredittgrense: " #: src/exch.c:366 #, c-format msgid "^{<1>^} Borrow money " -msgstr "^{<1>^} Låne penger " +msgstr "^{<1>^} Låne penger " #: src/exch.c:368 #, c-format msgid "^{<2>^} Repay debt " -msgstr "^{<2>^} Nedbetal gjeld " +msgstr "^{<2>^} Nedbetal gjeld " #: src/exch.c:370 #, c-format @@ -885,7 +898,7 @@ msgstr "Banken vil ikke låne deg mer penger." #: src/exch.c:447 #, c-format msgid "How much do you wish to borrow? " -msgstr "Hvor mye ønsker du å låne? " +msgstr "Hvor mye ønsker du å låne? " #: src/exch.c:479 #, c-format @@ -930,7 +943,7 @@ msgstr " Aksjetransaksjon for %ls " #, c-format msgctxt "label|Stock A" msgid "Shares issued: " -msgstr "Aksjer utstedt: " +msgstr "Aksjer utstedt: " #. TRANSLATORS: "Shares left" is the number of shares that are #. left to be purchased in the current company. @@ -938,7 +951,7 @@ msgstr "Aksjer utstedt: " #, c-format msgctxt "label|Stock A" msgid "Shares left: " -msgstr "Aksjer igjen: " +msgstr "Aksjer igjen: " #. TRANSLATORS: "Price per share" is the cost of each share in #. the current company. @@ -946,7 +959,7 @@ msgstr "Aksjer igjen: " #, c-format msgctxt "label|Stock A" msgid "Price per share: " -msgstr "Pris per aksje:" +msgstr "Pris per aksje: " #. TRANSLATORS: "Return" is the share return as a percentage. #: src/exch.c:613 @@ -967,7 +980,7 @@ msgstr "Utbytte: " #, c-format msgctxt "label|Stock B" msgid "Current holdings: " -msgstr "Nåværende aksjepost: " +msgstr "Aksjeportefølge: " #. TRANSLATORS: "Percentage owned" is the current player's #. percentage ownership in this particular company. @@ -975,13 +988,13 @@ msgstr "Nåværende aksjepost: " #, c-format msgctxt "label|Stock B" msgid "Percentage owned: " -msgstr "Eierandel: " +msgstr "Eierandel: " #: src/exch.c:638 #, c-format msgctxt "label|Stock B" msgid "Current cash: " -msgstr "Nåværende kontanter: " +msgstr "Kontanter: " #. TRANSLATORS: Each label may be up to 35 characters wide #. (for <1> and <2>) or 36 characters wide (for <3> and <4>). @@ -998,7 +1011,7 @@ msgstr "^{<2>^} Selg aksjer tilbake til selskap" #: src/exch.c:655 #, c-format msgid "^{<3>^} Bid company to issue more shares" -msgstr "^{<3>^} Oppmode firmaet til å utstede flere aksjer" +msgstr "^{<3>^} Be firmaet utstede flere aksjer" #: src/exch.c:657 #, c-format @@ -1156,7 +1169,7 @@ msgid "" "\n" "^{File %s: %s^}" msgstr "" -"Spillet %d kunne ikke lastes fra disk\n" +"Spillet %d kunne ikke lastes fra disk.\n" "\n" "^{Fil %s: %s^}" @@ -1218,7 +1231,7 @@ msgid "" "\n" "^{File %s: %s^}" msgstr "" -"Spillet%d kunne ikke lagres til disken\n" +"Spillet %d kunne ikke lagres til disken.\n" "\n" "^{Fil %s: %s^}" @@ -1311,16 +1324,15 @@ msgid "" " ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" msgstr "" -"^BStar Traders^N er et enkelt spill med interstellar handel. Målet med\n" -"spillet er å samle størst mulige mengde formue. Dette gjøres ved å\n" -"skape interstellare seilingsleder, utvide dem og kjøpe aksjer i\n" -"selskapene for å kontrollere dem. Aksjer stiger i verdi ettesom selskaps-\n" -"operasjoner utvides. Dessuten, avkastningen på hver del (i prosent)\n" -"endres også. Spillere kan også låne fra Interstellar Handelsbank\n" -"for å finansiere flere kjøp på børsen\n" +"^BStar Traders^N er et enkelt spill med interstellar handel. Målet med spillet\n" +"er å samle størst mulige mengde formue. Dette gjøres ved å skape interstel-\n" +"lare seilingsleder, utvide dem og kjøpe aksjer i selskapene for å kontrol-\n" +"lere dem. Aksjer stiger i verdi ettesom selskaps-operasjoner utvides. Des-\n" +"suten, avkastningen på hver del (i prosent) endres også. Spillere kan også\n" +"låne fra Interstellar Handelsbank for å finansiere flere kjøp på børsen.\n" "\n" -"Kartet over galaksen er representert ved en^B~x^N x ^B~y^N rutenett. En typisk\n" -"seksjon kan være:\n" +"Kartet over galaksen er representert ved en ^B~x^N x ^B~y^N rutenett. En typisk sek-\n" +"sjon kan være:\n" "\n" " ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N fremstiller ^Btomrom^N,\n" @@ -1346,9 +1358,9 @@ msgid "" "will set up an ^Boutpost^N, not belonging to any company. Thus, if move ^k~3^N is\n" "selected on the above map, a ^o ~+ ^N would be placed at that position.\n" msgstr "" -"Datamaskinen velger ^B~m^N trekk (merket ^k~1^N to ^k~M^N) vilkårlig, og legger disse\n" -"på kartet. Å velge noen av de markerte stedene, trykk på bokstaven.\n" -"For eksempel kan noen av trekkene på kartet være:\n" +"Datamaskinen velger ^B~m^N trekk (merket ^k~1^N to ^k~M^N) vilkårlig, og legger disse på\n" +"kartet. Å velge noen av de markerte stedene, trykk på bokstaven.\n" +"Noen av trekkene på kartet kan for eksempel være:\n" "\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1358,9 +1370,10 @@ msgstr "" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" "\n" "\n" -"Å velge en posisjon som ^Bikke^N er ved siden av en stjerne (trekk som ^k~1^N, ^k~3^N eller ^k~5^N)\n" -"vil sette opp en ^Butpost^N, som ikke tilhører noe selskap. Slik at hvis trekk ^k~3^N er\n" -"valgt på kartet ovenfor, en ^o ~+ ^N vil bli plassert på den posisjonen.\n" +"Å velge en posisjon som ^Bikke^N er ved siden av en stjerne (trekk som ^k~1^N, ^k~3^N\n" +"eller ^k~5^N) vil sette opp en ^Butpost^N, som ikke tilhører noe selskap. Slik at\n" +"hvis trekk ^k~3^N er valgt på kartet ovenfor, en ^o ~+ ^N vil bli plassert på den\n" +"posisjonen.\n" #: src/help.c:150 msgid "" @@ -1380,15 +1393,15 @@ msgid "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" msgstr "" -"Hvis, på den annen side, en posisjon ved siden av en stjerne (eller annet utpost) er\n" -"valgt, vil et ^Bfirma^N bli dannet og dets bokstav vises på kartet.\n" -"Som en belønning for å skape firmaet får du de første fem aksjene.\n" -"Opp til ^B~c^N firmaer kan opprettes på denne måten.\n" +"Hvis, på den annen side, en posisjon ved siden av en stjerne (eller annet\n" +"utpost) er valgt, vil et ^Bfirma^N bli dannet og dets bokstav vises på kartet.\n" +"Som en belønning for å skape firmaet får du de første fem aksjene. Opp til\n" +"^B~c^N firmaer kan opprettes på denne måten.\n" "\n" -"Hvis en posisjon ved siden av et eksisterende selskap er valgt, vli selskapet\n" -"utvide sin virksomhet med én rute. Dette øker kostnadene for sine aksjer\n" -"og dermed avkastningen. Dermed, hvis kartet er som vist nedenfor, velge ^ k ~ 6 ^ N\n" -"eller ^k~8^N øker selskapet ^B~B^N sin skipslei:\n" +"Hvis en posisjon ved siden av et eksisterende selskap er valgt, vil sels-\n" +"kapet utvide sin virksomhet med én rute. Dette øker kostnadene for sine\n" +"aksjer og dermed avkastningen. Dermed, hvis kartet er som vist nedenfor,\n" +"velge ^k~6^N eller ^k~8^N øker selskapet ^B~B^N sin skipslei:\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" @@ -1414,9 +1427,9 @@ msgid "" "more valuable: the company's share price will increase by a greater amount\n" "than it would for outposts not next to stars.\n" msgstr "" -"Å velge posisjoner ved siden stjerner øker verdien av din beholdning med ca \n" -"fem ganger så mye som en forlengelse ikke ved siden av en stjerne. Derfor bør trekk\n" -"^k~6^N foretrekkes fremfor ^k~8^N.\n" +"Å velge posisjoner ved siden stjerner øker verdien av din beholdning med ca\n" +"fem ganger så mye som en forlengelse ikke ved siden av en stjerne. Derfor\n" +"bør trekk ^k~6^N foretrekkes fremfor ^k~8^N.\n" "\n" " ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" @@ -1424,10 +1437,10 @@ msgstr "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" "\n" -"Du kan også utvide ethvert selskap ved å velge posisjoner ved siden av utposter.\n" -"Slike utposter vil bli slukt av det selskapet. Dermed vil trekk ^k~1^N utvide selskapet ^B~C^N\n" -"med ^Bto^N kvadrater. Som en bonus er utposter ved siden av stjernene\n" -"mer verdifulle: selskapets aksjekurs vil øke med en større mengde\n" +"Du kan også utvide ethvert selskap ved å velge posisjoner ved siden av\n" +"utposter. Slike utposter vil bli slukt av det selskapet. Dermed vil trekk ^k~1^N\n" +"utvide selskapet ^B~C^N med ^Bto^N kvadrater. Som en bonus er utposter ved siden av\n" +"stjernene mer verdifulle: selskapets aksjekurs vil øke med en større mengde\n" "enn det ville gjort for utposter som ikke er ved siden av stjerner.\n" #: src/help.c:186 @@ -1449,21 +1462,22 @@ msgid "" "proportional to the amount owned in the old company. As well, a cash bonus\n" "is also paid, proportional to the percentage of the old company owned.\n" msgstr "" -"Hvis to selskaper skilles på kartet ved bare én rute, da kan de\n" -"^Bfusjoneres^N i ett selskap ved å velge den posisjonen (hvis tilgjengelig). For\n" -"eksempel, på kartet nedenfor kan bedriftene ^B~A^N og ^B~B^N fusjoneres ved å velge ^k~5^N.\n" -"Når dette skjer tar selskapet med størst aktiva-verdi over det andre.\n" -"Her kan selskapet ^B~B^N ta over selskapet ^B~A^N. Selskapet ^B~A^N opphører å\n" -"eksistere, selv om det kan dukke opp igjen som en helt nytt selskap på et senere tidspunkt.n\n" +"Hvis to selskaper skilles på kartet ved bare én rute, da kan de ^Bfusjoneres^N i\n" +"ett selskap ved å velge den posisjonen (hvis tilgjengelig). For eksempel, på\n" +"kartet nedenfor kan bedriftene ^B~A^N og ^B~B^N fusjoneres ved å velge ^k~5^N. Når dette\n" +"skjer tar selskapet med størst aktiva-verdi over det andre. Her kan sels-\n" +"kapet ^B~B^N ta over selskapet ^B~A^N. Selskapet ^B~A^N opphører å eksistere, selv om det\n" +"kan dukke opp igjen som en helt nytt selskap på et senere tidspunkt.\n" +"\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n" " ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N trekk ^k~5^N fusjonerer selskapene ^B~A^N og ^B~B^N.\n" " ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n" "\n" -"Når selskaper fusjonerer blir spillerne tildelt aksjer i det dominerende selskapet\n" -"proporsjonal med mengden eid i det gamle selskapet. en kontantbonus\n" -"blir også betalt, proporsjonal med andelen eid av det gamle selskapet.\n" +"Når selskaper fusjonerer blir spillerne tildelt aksjer i det dominerende\n" +"selskapet proporsjonal med mengden eid i det gamle selskapet. En kontant-\n" +"bonus blir også betalt, proporsjonal med andelen eid av det gamle selskapet.\n" #: src/help.c:205 msgid "" @@ -1484,22 +1498,22 @@ msgid "" "The ^Bwinner of the game^N is the person with the greatest net worth (total\n" "value of cash, stock and debt). ^HGood luck^N and may the best person win!\n" msgstr "" -"Når du har valgt ditt trekk, går du inn i ^BInterstellar Børs^N. Her\n" -"kan du kjøpe aksjer, selge dem, låne fra Handel Bank eller tilbakebetale \n" -"noen av gjelden din (hvis det er aktuelt). Merk at hvert selskap utsteder et begrenset\n" -"antall aksjer - du kan ikke gå på å kjøpe for alltid! Du kan imidlertid by på\n" -"flere aksjer som utstedes. Du har en bedre sjanse for å lykkes hvis du\n" +"Når du har valgt ditt trekk, går du inn i ^BInterstellar Børs^N. Her kan du\n" +"kjøpe aksjer, selge dem, låne fra Handel Bank eller tilbakebetale noen av\n" +"gjelden din (hvis det er aktuelt). Merk at hvert selskap utsteder et begren-\n" +"set antall aksjer — du kan ikke gå på å kjøpe for alltid! Du kan imidlertid\n" +"by på flere aksjer som utstedes. Du har en bedre sjanse for å lykkes hvis du\n" "eier en større andel av selskapet.\n" "\n" -"Spillet slutter vanligvis etter ^B~t^N runder. Imidlertid kan du avslutte spillet før\n" -"ved å trykke ^K^N når anmodet om å velge et trekk. Individuelle\n" -"spillere kan erklære seg konkurs når som helst. Hvis gjelden er stor\n" -"nok, kan banken gjøre dette for deg! Hvis du ikke fullfører spillet i\n" -"den tiden du har tilgjengelig, kan du lagre spillet og fortsette senere.\n" +"Spillet slutter vanligvis etter ^B~t^N runder. Imidlertid kan du avslutte spil-\n" +"let før ved å trykke ^K^N når anmodet om å velge et trekk. Individuelle\n" +"spillere kan erklære seg konkurs når som helst. Hvis gjelden er stor nok,\n" +"kan banken gjøre dette for deg! Hvis du ikke fullfører spillet i den tiden\n" +"du har tilgjengelig, kan du lagre spillet og fortsette senere.\n" "\n" "\n" -"^BVinneren av spillet^N er den personen med størst formue (total\n" -"verdi av kontanter, aksjer og gjeld). ^HLykke til^N, må den beste vinne!\n" +"^BVinneren av spillet^N er den personen med størst formue (totalverdi av\n" +"kontanter, aksjer og gjeld). ^HLykke til^N, må den beste vinne!\n" #: src/help.c:225 msgid "@ Help text, page 7\n" @@ -1548,7 +1562,7 @@ msgstr "[ Trykk Linjeskift for å fortsette ] " #: src/help.c:494 #, c-format msgid "[ Press to continue or for the previous page ] " -msgstr "[Trykk for å fortsette eller for forrige side]" +msgstr "[ Trykk for å fortsette eller for forrige side ] " #: src/intf.c:110 #, c-format @@ -1558,7 +1572,7 @@ msgstr "%s: streng har feil format: «%s»" #: src/intf.c:126 #, c-format msgid "%s: character has illegal width: `%lc'" -msgstr "%s: tegn har ugyldig bredde «%lc»" +msgstr "%s: tegn har ugyldig bredde: «%lc»" #: src/intf.c:434 #, c-format @@ -1639,7 +1653,7 @@ msgstr "ikke mer minne" #: src/utils.c:571 #, c-format msgid "xmbstowcs: `%s'" -msgstr "xmbstowcs: `%s'" +msgstr "xmbstowcs: «%s»" #: src/utils.c:611 #, c-format @@ -1654,7 +1668,7 @@ msgstr "xwcrtomb: «%lc»" #: lib/getopt.c:547 lib/getopt.c:576 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: Valget «%s» er flertydig; muligheter:" +msgstr "%s: valget «%s» er flertydig; muligheter:" #: lib/getopt.c:624 lib/getopt.c:628 #, c-format From b754e917a25881df5493a9a92516abfe458d6e73 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Wed, 7 Nov 2012 20:42:31 +1100 Subject: [PATCH 10/39] More word-wrapping and white-space adjustment --- po/nb.po | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/po/nb.po b/po/nb.po index f7c504e..06bc8be 100644 --- a/po/nb.po +++ b/po/nb.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.4\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 13:57+1000\n" -"PO-Revision-Date: 2012-11-06 16:05+0100\n" +"PO-Revision-Date: 2012-11-07 20:38+1100\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" @@ -133,8 +133,7 @@ msgstr "" msgid "Report bugs to %s <%s>.\n" msgstr "" "Rapporter feil, på engelsk, til %s <%s>.\n" -"Oversettelsesfeil kan rapporteres til\n" -"\n" +"Oversettelsesfeil kan rapporteres til .\n" #. TRANSLATORS: %s is the e-mail address for reporting bugs. As #. with the previous string, please add ANOTHER line with the @@ -146,8 +145,7 @@ msgstr "" msgid "Report bugs to <%s>.\n" msgstr "" "Rapporter feil, på engelsk, til <%s>.\n" -"Oversettelsesfeil kan rapporteres til\n" -"\n" +"Oversettelsesfeil kan rapporteres til .\n" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". @@ -173,7 +171,7 @@ msgstr "Altair Starways" #: src/globals.c:48 msgid "Betelgeuse, Ltd" -msgstr "Betelgeuse, A/S" +msgstr "Betelgeuse A/S" #: src/globals.c:49 msgid "Capella Freight Co" @@ -988,7 +986,7 @@ msgstr "Aksjeportefølge: " #, c-format msgctxt "label|Stock B" msgid "Percentage owned: " -msgstr "Eierandel: " +msgstr "Eierandel: " #: src/exch.c:638 #, c-format @@ -1359,8 +1357,8 @@ msgid "" "selected on the above map, a ^o ~+ ^N would be placed at that position.\n" msgstr "" "Datamaskinen velger ^B~m^N trekk (merket ^k~1^N to ^k~M^N) vilkårlig, og legger disse på\n" -"kartet. Å velge noen av de markerte stedene, trykk på bokstaven.\n" -"Noen av trekkene på kartet kan for eksempel være:\n" +"kartet. Å velge noen av de markerte stedene, trykk på bokstaven. Noen av\n" +"trekkene på kartet kan for eksempel være:\n" "\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1512,7 +1510,7 @@ msgstr "" "du har tilgjengelig, kan du lagre spillet og fortsette senere.\n" "\n" "\n" -"^BVinneren av spillet^N er den personen med størst formue (totalverdi av\n" +"^BVinneren av spillet^N er den personen med størst formue (totalverdi av\n" "kontanter, aksjer og gjeld). ^HLykke til^N, må den beste vinne!\n" #: src/help.c:225 From 2fd98ef0daa5a25766391abaa989003a493d45ea Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 8 Nov 2012 19:52:15 +1100 Subject: [PATCH 11/39] Update nb.po to the latest version available from TP --- po/nb.po | 106 +++++++++++++++++++++++++++---------------------------- 1 file changed, 52 insertions(+), 54 deletions(-) diff --git a/po/nb.po b/po/nb.po index f7c504e..3563686 100644 --- a/po/nb.po +++ b/po/nb.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.4\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 13:57+1000\n" -"PO-Revision-Date: 2012-11-06 16:05+0100\n" +"PO-Revision-Date: 2012-11-08 08:46+0100\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" @@ -133,8 +133,7 @@ msgstr "" msgid "Report bugs to %s <%s>.\n" msgstr "" "Rapporter feil, på engelsk, til %s <%s>.\n" -"Oversettelsesfeil kan rapporteres til\n" -"\n" +"Oversettelsesfeil kan rapporteres til \n" #. TRANSLATORS: %s is the e-mail address for reporting bugs. As #. with the previous string, please add ANOTHER line with the @@ -146,8 +145,7 @@ msgstr "" msgid "Report bugs to <%s>.\n" msgstr "" "Rapporter feil, på engelsk, til <%s>.\n" -"Oversettelsesfeil kan rapporteres til\n" -"\n" +"Oversettelsesfeil kan rapporteres til \n" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". @@ -173,7 +171,7 @@ msgstr "Altair Starways" #: src/globals.c:48 msgid "Betelgeuse, Ltd" -msgstr "Betelgeuse, A/S" +msgstr "Betelgeuse A/S" #: src/globals.c:49 msgid "Capella Freight Co" @@ -1324,19 +1322,19 @@ msgid "" " ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" msgstr "" -"^BStar Traders^N er et enkelt spill med interstellar handel. Målet med spillet\n" -"er å samle størst mulige mengde formue. Dette gjøres ved å skape interstel-\n" -"lare seilingsleder, utvide dem og kjøpe aksjer i selskapene for å kontrol-\n" -"lere dem. Aksjer stiger i verdi ettesom selskaps-operasjoner utvides. Des-\n" -"suten, avkastningen på hver del (i prosent) endres også. Spillere kan også\n" +"^BStar Traders^N er et enkelt spill med interstellar handel. Målet med spillet\n" +"er å samle størst mulig formue. Dette gjøres ved å skape interstellare\n" +"seilingsleder, utvide dem og kjøpe aksjer i selskapene for å kontrollere\n" +"dem. Aksjer stiger i verdi ettesom selskapsoperasjonene utvides. Dessuten,\n" +"avkastningen på hver del (i prosent) endres også. Spillere kan også\n" "låne fra Interstellar Handelsbank for å finansiere flere kjøp på børsen.\n" "\n" -"Kartet over galaksen er representert ved en ^B~x^N x ^B~y^N rutenett. En typisk sek-\n" -"sjon kan være:\n" +"Kartet over galaksen er representert ved en ^B~x^N x ^B~y^N rutenett.\n" +"En typisk seksjon kan være:\n" "\n" " ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" -" ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N fremstiller ^Btomrom^N,\n" -" ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N ^s ~* ^N fremstiller en ^Bstjerne^N.\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N forestiller ^Btomrom^N,\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N ^s ~* ^N forestiller en ^Bstjerne^N.\n" " ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" @@ -1358,8 +1356,8 @@ msgid "" "will set up an ^Boutpost^N, not belonging to any company. Thus, if move ^k~3^N is\n" "selected on the above map, a ^o ~+ ^N would be placed at that position.\n" msgstr "" -"Datamaskinen velger ^B~m^N trekk (merket ^k~1^N to ^k~M^N) vilkårlig, og legger disse på\n" -"kartet. Å velge noen av de markerte stedene, trykk på bokstaven.\n" +"Datamaskinen velger ^B~m^N trekk (merket ^k~1^N to ^k~M^N) vilkårlig, og legger disse på\n" +"kartet. For å velge noen av de markerte stedene, trykk på bokstaven.\n" "Noen av trekkene på kartet kan for eksempel være:\n" "\n" "\n" @@ -1370,9 +1368,9 @@ msgstr "" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" "\n" "\n" -"Å velge en posisjon som ^Bikke^N er ved siden av en stjerne (trekk som ^k~1^N, ^k~3^N\n" -"eller ^k~5^N) vil sette opp en ^Butpost^N, som ikke tilhører noe selskap. Slik at\n" -"hvis trekk ^k~3^N er valgt på kartet ovenfor, en ^o ~+ ^N vil bli plassert på den\n" +"Å velge en posisjon som ^Bikke^N er ved siden av en stjerne (trekk som ^k~1^N, ^k~3^N\n" +"eller ^k~5^N) vil sette opp en ^Butpost^N, som ikke tilhører noe selskap. Slik at\n" +"hvis trekk ^k~3^N er valgt på kartet ovenfor vil ^o ~+ ^N bli plassert ved den\n" "posisjonen.\n" #: src/help.c:150 @@ -1393,15 +1391,15 @@ msgid "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" msgstr "" -"Hvis, på den annen side, en posisjon ved siden av en stjerne (eller annet\n" -"utpost) er valgt, vil et ^Bfirma^N bli dannet og dets bokstav vises på kartet.\n" -"Som en belønning for å skape firmaet får du de første fem aksjene. Opp til\n" +"Hvis på den annen side en posisjon ved siden av en stjerne (eller annen\n" +"utpost) er valgt, vil et ^Bfirma^N bli dannet og dets bokstav vises på kartet.\n" +"Som en belønning for å skape firmaet får du de første fem aksjene. Opp til\n" "^B~c^N firmaer kan opprettes på denne måten.\n" "\n" -"Hvis en posisjon ved siden av et eksisterende selskap er valgt, vil sels-\n" -"kapet utvide sin virksomhet med én rute. Dette øker kostnadene for sine\n" -"aksjer og dermed avkastningen. Dermed, hvis kartet er som vist nedenfor,\n" -"velge ^k~6^N eller ^k~8^N øker selskapet ^B~B^N sin skipslei:\n" +"Hvis en posisjon ved siden av et eksisterende selskap er valgt vil selskapet\n" +"utvide sin virksomhet med én rute. Dette øker kostnadene til dets aksjer\n" +"og dermed avkastningen. Dermed, hvis kartet er som vist nedenfor,\n" +"å velge ^k~6^N eller ^k~8^N øker selskapet ^B~B^Ns skipslei:\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" @@ -1427,9 +1425,9 @@ msgid "" "more valuable: the company's share price will increase by a greater amount\n" "than it would for outposts not next to stars.\n" msgstr "" -"Å velge posisjoner ved siden stjerner øker verdien av din beholdning med ca\n" -"fem ganger så mye som en forlengelse ikke ved siden av en stjerne. Derfor\n" -"bør trekk ^k~6^N foretrekkes fremfor ^k~8^N.\n" +"Å velge posisjoner ved siden av stjerner øker verdien av din beholdning med\n" +"ca. fem ganger så mye som en forlengelse som ikke er ved siden av en\n" +"stjerne. Derfor bør trekk ^k~6^N foretrekkes fremfor ^k~8^N.\n" "\n" " ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" @@ -1437,10 +1435,10 @@ msgstr "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" "\n" -"Du kan også utvide ethvert selskap ved å velge posisjoner ved siden av\n" -"utposter. Slike utposter vil bli slukt av det selskapet. Dermed vil trekk ^k~1^N\n" -"utvide selskapet ^B~C^N med ^Bto^N kvadrater. Som en bonus er utposter ved siden av\n" -"stjernene mer verdifulle: selskapets aksjekurs vil øke med en større mengde\n" +"Du kan også utvide ethvert selskap ved å velge posisjoner ved siden av\n" +"utposter. Slike utposter vil bli slukt av det selskapet. Dermed vil trekk ^k~1^N\n" +"utvide selskap ^B~C^N med ^Bto^N kvadrater. Som en bonus er utposter ved siden av\n" +"stjernene mer verdifulle: selskapets aksjekurs vil øke med en større mengde\n" "enn det ville gjort for utposter som ikke er ved siden av stjerner.\n" #: src/help.c:186 @@ -1462,11 +1460,11 @@ msgid "" "proportional to the amount owned in the old company. As well, a cash bonus\n" "is also paid, proportional to the percentage of the old company owned.\n" msgstr "" -"Hvis to selskaper skilles på kartet ved bare én rute, da kan de ^Bfusjoneres^N i\n" -"ett selskap ved å velge den posisjonen (hvis tilgjengelig). For eksempel, på\n" -"kartet nedenfor kan bedriftene ^B~A^N og ^B~B^N fusjoneres ved å velge ^k~5^N. Når dette\n" -"skjer tar selskapet med størst aktiva-verdi over det andre. Her kan sels-\n" -"kapet ^B~B^N ta over selskapet ^B~A^N. Selskapet ^B~A^N opphører å eksistere, selv om det\n" +"Hvis to selskaper skilles på kartet ved bare én rute, kan de ^Bfusjoneres^N i\n" +"ett selskap ved å velge den posisjonen (hvis tilgjengelig). For eksempel på\n" +"kartet nedenfor kan bedriftene ^B~A^N og ^B~B^N fusjoneres ved å velge ^k~5^N. Når dette\n" +"skjer tar selskapet med størst aktiva over det andre. Her kan selskap\n" +"^B~B^N ta over selskap ^B~A^N. Selskap ^B~A^N opphører å eksistere, selv om det\n" "kan dukke opp igjen som en helt nytt selskap på et senere tidspunkt.\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1475,9 +1473,9 @@ msgstr "" " ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n" "\n" -"Når selskaper fusjonerer blir spillerne tildelt aksjer i det dominerende\n" -"selskapet proporsjonal med mengden eid i det gamle selskapet. En kontant-\n" -"bonus blir også betalt, proporsjonal med andelen eid av det gamle selskapet.\n" +"Når selskaper fusjonerer blir spillerne tildelt aksjer i det dominerende\n" +"selskapet proporsjonal med mengden eid i det gamle selskapet. En kontant-\n" +"bonus blir og utbetalt, proporsjonalt med eierandelen i det gamle selskapet.\n" #: src/help.c:205 msgid "" @@ -1498,21 +1496,21 @@ msgid "" "The ^Bwinner of the game^N is the person with the greatest net worth (total\n" "value of cash, stock and debt). ^HGood luck^N and may the best person win!\n" msgstr "" -"Når du har valgt ditt trekk, går du inn i ^BInterstellar Børs^N. Her kan du\n" -"kjøpe aksjer, selge dem, låne fra Handel Bank eller tilbakebetale noen av\n" -"gjelden din (hvis det er aktuelt). Merk at hvert selskap utsteder et begren-\n" -"set antall aksjer — du kan ikke gå på å kjøpe for alltid! Du kan imidlertid\n" -"by på flere aksjer som utstedes. Du har en bedre sjanse for å lykkes hvis du\n" -"eier en større andel av selskapet.\n" +"Når du har valgt ditt trekk går du inn i ^BInterstellar Børs^N. Her kan du\n" +"kjøpe og selge aksjer, låne fra Handelsbanken eller tilbakebetale noe av\n" +"gjelden din (hvis det er aktuelt). Merk at hvert selskap utsteder et\n" +"begrenset antall aksjer — du kan ikke fortsette å kjøpe for alltid! Du kan\n" +"imidlertid by på flere aksjer som utstedes. Du har en bedre sjanse for å\n" +"lykkes hvis du eier en større andel av selskapet.\n" "\n" -"Spillet slutter vanligvis etter ^B~t^N runder. Imidlertid kan du avslutte spil-\n" -"let før ved å trykke ^K^N når anmodet om å velge et trekk. Individuelle\n" -"spillere kan erklære seg konkurs når som helst. Hvis gjelden er stor nok,\n" -"kan banken gjøre dette for deg! Hvis du ikke fullfører spillet i den tiden\n" +"Normalt slutter spillet etter ^B~t^N runder. Men du kan avslutte tidligere\n" +"ved å trykke ^K^N når anmodet om å velge et trekk. Individuelle\n" +"spillere kan erklære seg konkurs når som helst. Hvis gjelden er stor nok,\n" +"kan banken gjøre dette for deg! Hvis du ikke fullfører spillet i den tiden\n" "du har tilgjengelig, kan du lagre spillet og fortsette senere.\n" "\n" "\n" -"^BVinneren av spillet^N er den personen med størst formue (totalverdi av\n" +"^BVinneren av spillet^N er den personen med størst formue (totalverdi av\n" "kontanter, aksjer og gjeld). ^HLykke til^N, må den beste vinne!\n" #: src/help.c:225 @@ -1551,7 +1549,7 @@ msgstr "Side %d av %d" #: src/help.c:487 src/intf.c:3035 #, c-format msgid "[ Press to continue ] " -msgstr "[ Trykk Linjeskift for å fortsette ] " +msgstr "[ Trykk for å fortsette ] " #. TRANSLATORS: The specific use of and #. is not essential: you can use , From 2e528f8698385bd3789d71042640c5ffe5e9e3ee Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 9 Nov 2012 17:10:55 +1100 Subject: [PATCH 12/39] Update nb.po to the latest version available from TP --- po/nb.po | 104 +++++++++++++++++++++++++++---------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/po/nb.po b/po/nb.po index 3563686..8e1c5b6 100644 --- a/po/nb.po +++ b/po/nb.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.4\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 13:57+1000\n" -"PO-Revision-Date: 2012-11-08 08:46+0100\n" +"PO-Revision-Date: 2012-11-08 16:48+0100\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" @@ -133,7 +133,7 @@ msgstr "" msgid "Report bugs to %s <%s>.\n" msgstr "" "Rapporter feil, på engelsk, til %s <%s>.\n" -"Oversettelsesfeil kan rapporteres til \n" +"Oversettelsesfeil kan rapporteres til .\n" #. TRANSLATORS: %s is the e-mail address for reporting bugs. As #. with the previous string, please add ANOTHER line with the @@ -145,7 +145,7 @@ msgstr "" msgid "Report bugs to <%s>.\n" msgstr "" "Rapporter feil, på engelsk, til <%s>.\n" -"Oversettelsesfeil kan rapporteres til \n" +"Oversettelsesfeil kan rapporteres til .\n" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". @@ -986,7 +986,7 @@ msgstr "Aksjeportefølge: " #, c-format msgctxt "label|Stock B" msgid "Percentage owned: " -msgstr "Eierandel: " +msgstr "Eierandel: " #: src/exch.c:638 #, c-format @@ -1322,15 +1322,15 @@ msgid "" " ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" msgstr "" -"^BStar Traders^N er et enkelt spill med interstellar handel. Målet med spillet\n" -"er å samle størst mulig formue. Dette gjøres ved å skape interstellare\n" -"seilingsleder, utvide dem og kjøpe aksjer i selskapene for å kontrollere\n" -"dem. Aksjer stiger i verdi ettesom selskapsoperasjonene utvides. Dessuten,\n" -"avkastningen på hver del (i prosent) endres også. Spillere kan også\n" -"låne fra Interstellar Handelsbank for å finansiere flere kjøp på børsen.\n" +"^BStar Traders^N er et enkelt spill med interstellar handel. Målet med spillet\n" +"er å samle størst mulig formue. Dette gjøres ved å skape interstellare\n" +"seilingsleder, utvide dem og kjøpe aksjer i selskapene for å kontrollere\n" +"dem. Aksjer stiger i verdi ettesom selskapsoperasjonene utvides. Dessuten,\n" +"avkastningen på hver del (i prosent) endres også. Spillere kan også låne fra\n" +"Interstellar Handelsbank for å finansiere flere kjøp på børsen.\n" "\n" -"Kartet over galaksen er representert ved en ^B~x^N x ^B~y^N rutenett.\n" -"En typisk seksjon kan være:\n" +"Kartet over galaksen er representert ved en ^B~x^N x ^B~y^N rutenett. En typisk\n" +"seksjon kan være:\n" "\n" " ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N forestiller ^Btomrom^N,\n" @@ -1356,9 +1356,9 @@ msgid "" "will set up an ^Boutpost^N, not belonging to any company. Thus, if move ^k~3^N is\n" "selected on the above map, a ^o ~+ ^N would be placed at that position.\n" msgstr "" -"Datamaskinen velger ^B~m^N trekk (merket ^k~1^N to ^k~M^N) vilkårlig, og legger disse på\n" -"kartet. For å velge noen av de markerte stedene, trykk på bokstaven.\n" -"Noen av trekkene på kartet kan for eksempel være:\n" +"Datamaskinen velger ^B~m^N trekk (merket ^k~1^N to ^k~M^N) vilkårlig, og legger disse på\n" +"kartet. For å velge noen av de markerte stedene, trykk på bokstaven. Noen av\n" +"trekkene på kartet kan for eksempel være:\n" "\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1368,9 +1368,9 @@ msgstr "" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" "\n" "\n" -"Å velge en posisjon som ^Bikke^N er ved siden av en stjerne (trekk som ^k~1^N, ^k~3^N\n" -"eller ^k~5^N) vil sette opp en ^Butpost^N, som ikke tilhører noe selskap. Slik at\n" -"hvis trekk ^k~3^N er valgt på kartet ovenfor vil ^o ~+ ^N bli plassert ved den\n" +"Å velge en posisjon som ^Bikke^N er ved siden av en stjerne (trekk som ^k~1^N, ^k~3^N\n" +"eller ^k~5^N) vil sette opp en ^Butpost^N, som ikke tilhører noe selskap. Slik at\n" +"hvis trekk ^k~3^N er valgt på kartet ovenfor vil ^o ~+ ^N bli plassert ved den\n" "posisjonen.\n" #: src/help.c:150 @@ -1391,15 +1391,15 @@ msgid "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" msgstr "" -"Hvis på den annen side en posisjon ved siden av en stjerne (eller annen\n" -"utpost) er valgt, vil et ^Bfirma^N bli dannet og dets bokstav vises på kartet.\n" -"Som en belønning for å skape firmaet får du de første fem aksjene. Opp til\n" -"^B~c^N firmaer kan opprettes på denne måten.\n" +"Hvis på den annen side en posisjon ved siden av en stjerne (eller annen\n" +"utpost) er valgt, vil et ^Bfirma^N bli dannet og dets bokstav vises på kartet.\n" +"Som en belønning for å skape firmaet får du de første fem aksjene. Opp til ^B~c^N\n" +"firmaer kan opprettes på denne måten.\n" "\n" "Hvis en posisjon ved siden av et eksisterende selskap er valgt vil selskapet\n" -"utvide sin virksomhet med én rute. Dette øker kostnadene til dets aksjer\n" -"og dermed avkastningen. Dermed, hvis kartet er som vist nedenfor,\n" -"å velge ^k~6^N eller ^k~8^N øker selskapet ^B~B^Ns skipslei:\n" +"utvide sin virksomhet med én rute. Dette øker kostnadene til dets aksjer og\n" +"dermed avkastningen. Dermed, hvis kartet er som vist nedenfor, å velge ^k~6^N\n" +"eller ^k~8^N øker selskapet ^B~B^Ns skipslei:\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" @@ -1425,8 +1425,8 @@ msgid "" "more valuable: the company's share price will increase by a greater amount\n" "than it would for outposts not next to stars.\n" msgstr "" -"Å velge posisjoner ved siden av stjerner øker verdien av din beholdning med\n" -"ca. fem ganger så mye som en forlengelse som ikke er ved siden av en\n" +"Å velge posisjoner ved siden av stjerner øker verdien av din beholdning med\n" +"ca. fem ganger så mye som en forlengelse som ikke er ved siden av en\n" "stjerne. Derfor bør trekk ^k~6^N foretrekkes fremfor ^k~8^N.\n" "\n" " ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1435,10 +1435,10 @@ msgstr "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" "\n" -"Du kan også utvide ethvert selskap ved å velge posisjoner ved siden av\n" -"utposter. Slike utposter vil bli slukt av det selskapet. Dermed vil trekk ^k~1^N\n" -"utvide selskap ^B~C^N med ^Bto^N kvadrater. Som en bonus er utposter ved siden av\n" -"stjernene mer verdifulle: selskapets aksjekurs vil øke med en større mengde\n" +"Du kan også utvide ethvert selskap ved å velge posisjoner ved siden av\n" +"utposter. Slike utposter vil bli slukt av det selskapet. Dermed vil trekk ^k~1^N\n" +"utvide selskap ^B~C^N med ^Bto^N kvadrater. Som en bonus er utposter ved siden av\n" +"stjernene mer verdifulle: selskapets aksjekurs vil øke med en større mengde\n" "enn det ville gjort for utposter som ikke er ved siden av stjerner.\n" #: src/help.c:186 @@ -1460,21 +1460,21 @@ msgid "" "proportional to the amount owned in the old company. As well, a cash bonus\n" "is also paid, proportional to the percentage of the old company owned.\n" msgstr "" -"Hvis to selskaper skilles på kartet ved bare én rute, kan de ^Bfusjoneres^N i\n" -"ett selskap ved å velge den posisjonen (hvis tilgjengelig). For eksempel på\n" -"kartet nedenfor kan bedriftene ^B~A^N og ^B~B^N fusjoneres ved å velge ^k~5^N. Når dette\n" -"skjer tar selskapet med størst aktiva over det andre. Her kan selskap\n" -"^B~B^N ta over selskap ^B~A^N. Selskap ^B~A^N opphører å eksistere, selv om det\n" -"kan dukke opp igjen som en helt nytt selskap på et senere tidspunkt.\n" +"Hvis to selskaper skilles på kartet ved bare én rute, kan de ^Bfusjoneres^N i\n" +"ett selskap ved å velge den posisjonen (hvis tilgjengelig). For eksempel på\n" +"kartet nedenfor kan bedriftene ^B~A^N og ^B~B^N fusjoneres ved å velge ^k~5^N. Når dette\n" +"skjer tar selskapet med størst aktiva over det andre. Her kan selskap ^B~B^N ta\n" +"over selskap ^B~A^N. Selskap ^B~A^N opphører å eksistere, selv om det kan dukke opp\n" +"igjen som en helt nytt selskap på et senere tidspunkt.\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n" -" ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N trekk ^k~5^N fusjonerer selskapene ^B~A^N og ^B~B^N.\n" +" ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N Trekk ^k~5^N fusjonerer selskapene ^B~A^N og ^B~B^N.\n" " ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n" "\n" -"Når selskaper fusjonerer blir spillerne tildelt aksjer i det dominerende\n" -"selskapet proporsjonal med mengden eid i det gamle selskapet. En kontant-\n" +"Når selskaper fusjonerer blir spillerne tildelt aksjer i det dominerende\n" +"selskapet proporsjonal med mengden eid i det gamle selskapet. En kontant-\n" "bonus blir og utbetalt, proporsjonalt med eierandelen i det gamle selskapet.\n" #: src/help.c:205 @@ -1496,21 +1496,21 @@ msgid "" "The ^Bwinner of the game^N is the person with the greatest net worth (total\n" "value of cash, stock and debt). ^HGood luck^N and may the best person win!\n" msgstr "" -"Når du har valgt ditt trekk går du inn i ^BInterstellar Børs^N. Her kan du\n" -"kjøpe og selge aksjer, låne fra Handelsbanken eller tilbakebetale noe av\n" -"gjelden din (hvis det er aktuelt). Merk at hvert selskap utsteder et\n" -"begrenset antall aksjer — du kan ikke fortsette å kjøpe for alltid! Du kan\n" -"imidlertid by på flere aksjer som utstedes. Du har en bedre sjanse for å\n" -"lykkes hvis du eier en større andel av selskapet.\n" +"Når du har valgt ditt trekk går du inn i ^BInterstellar Børs^N. Her kan du kjøpe\n" +"og selge aksjer, låne fra Handelsbanken eller tilbakebetale noe av gjelden\n" +"din (hvis det er aktuelt). Merk at hvert selskap utsteder et begrenset\n" +"antall aksjer — du kan ikke fortsette å kjøpe for alltid! Du kan imidlertid\n" +"by på flere aksjer som utstedes. Du har en bedre sjanse for å lykkes hvis du\n" +"eier en større andel av selskapet.\n" "\n" -"Normalt slutter spillet etter ^B~t^N runder. Men du kan avslutte tidligere\n" -"ved å trykke ^K^N når anmodet om å velge et trekk. Individuelle\n" -"spillere kan erklære seg konkurs når som helst. Hvis gjelden er stor nok,\n" -"kan banken gjøre dette for deg! Hvis du ikke fullfører spillet i den tiden\n" -"du har tilgjengelig, kan du lagre spillet og fortsette senere.\n" +"Normalt slutter spillet etter ^B~t^N runder. Men du kan avslutte tidligere ved\n" +"å trykke ^K^N når anmodet om å velge et trekk. Individuelle spillere\n" +"kan erklære seg konkurs når som helst. Hvis gjelden er stor nok, kan banken\n" +"gjøre dette for deg! Hvis du ikke fullfører spillet i den tiden du har\n" +"tilgjengelig, kan du lagre spillet og fortsette senere.\n" "\n" "\n" -"^BVinneren av spillet^N er den personen med størst formue (totalverdi av\n" +"^BVinneren av spillet^N er den personen med størst formue (totalverdi av\n" "kontanter, aksjer og gjeld). ^HLykke til^N, må den beste vinne!\n" #: src/help.c:225 From 686932cdb386268ed01816708121cebe24c273e2 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 18 Jan 2013 17:51:12 +1100 Subject: [PATCH 13/39] Add the Danish translation by Joe Hansen Downloaded from the Translation Project, http://translationproject.org/PO-files/da/trader-7.4.da.po --- po/da.po | 1716 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1716 insertions(+) create mode 100644 po/da.po diff --git a/po/da.po b/po/da.po new file mode 100644 index 0000000..a54f85f --- /dev/null +++ b/po/da.po @@ -0,0 +1,1716 @@ +# Danish translation of trader. +# Copyright (C) 2012 John Zaitseff +# This file is distributed under the same license as the trader package. +# Joe Hansen , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: trader 7.4\n" +"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" +"POT-Creation-Date: 2012-05-09 13:57+1000\n" +"PO-Revision-Date: 2012-12-31 00:00+0000\n" +"Last-Translator: Joe Hansen \n" +"Language-Team: Danish \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/trader.c:235 +#, c-format +msgid "%s: invalid value for --max-turn: `%s'\n" +msgstr "%s: ugyldig værdi for --max-turn: »%s«\n" + +#: src/trader.c:251 +#, c-format +msgid "%s: invalid operand `%s'\n" +msgstr "%s: ugyldig operand »%s«\n" + +#: src/trader.c:260 +#, c-format +msgid "%s: invalid game number `%s'\n" +msgstr "%s: ugyldigt spilnummer »%s«\n" + +#: src/trader.c:269 +#, c-format +msgid "%s: extra operand `%s'\n" +msgstr "%s: ekstra operand »%s«\n" + +#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper +#. name of the author. The IPA pronunciation in this comment is in +#. UTF-8 encoding. +#: src/trader.c:284 +#, c-format +msgid "" +"Star Traders (%s) %s\n" +"Copyright (C) %s, John Zaitseff.\n" +"\n" +"Star Traders is a simple game of interstellar trading, where the object\n" +"of the game is to create companies, buy and sell shares, borrow and repay\n" +"money, in order to become the wealthiest player (the winner).\n" +"\n" +"This program is free software that is distributed under the terms of the\n" +"GNU General Public License, version 3 or later. You are welcome to\n" +"modify and/or distribute it under certain conditions. This program has\n" +"NO WARRANTY, to the extent permitted by law; see the License for details.\n" +msgstr "" +"Star Traders (%s) %s\n" +"Ophavsret %s, John Zaitseff.\n" +"\n" +"Star Traders er et simpelt spil med rumhandel, hvor formålet er at oprette\n" +"firmaer, købe og sælge aktier, låne og betale tilbage på lån, alt sammen\n" +"for at blive den rigeste spiller (vinderen).\n" +"\n" +"Dette program er frit programmel, som er distribueret under betingelserne\n" +"i GNU General Public License, version 3 eller senere. Du er velkommen til\n" +"at ændre og/eller distribuere programmet under bestemte betingelser. Dette\n" +"program har INGEN GARANTI, indenfor lovens rammer; se licensen for yderligere\n" +"detaljer.\n" + +#: src/trader.c:308 +#, c-format +msgid "%s: Try `%s --help' for more information.\n" +msgstr "%s: Prøv »%s --help« for yderligere information.\n" + +#: src/trader.c:311 +#, c-format +msgid "Usage: %s [OPTION ...] [GAME]\n" +msgstr "Brug: %s [TILVALG ...] [SPIL]\n" + +#: src/trader.c:312 +#, c-format +msgid "" +"Play Star Traders, a simple game of interstellar trading.\n" +"\n" +msgstr "" +"Spil Star Traders, et simpelt spil med rumhandel.\n" +"\n" + +#: src/trader.c:315 +#, c-format +msgid "" +"Options:\n" +" -V, --version output version information and exit\n" +" -h, --help display this help and exit\n" +" --no-color don't use color for displaying text\n" +" --max-turn=NUM set the number of turns to NUM\n" +"\n" +msgstr "" +"Tilvalg:\n" +" -V, --version vis versionsinformation og afslut\n" +" -h, --help vis denne hjælpetekst og afslut\n" +" --no-color brug ikke farve i tekstvisningen\n" +" --max-turn=ANT sæt antallet af runder til ANT\n" +"\n" + +#: src/trader.c:322 +#, c-format +msgid "" +"If GAME is specified as a number between 1 and 9, load and continue\n" +"playing that game. If GAME is not specified, start a new game.\n" +"\n" +msgstr "" +"Hvis GAME er angivet som et tal mellem 1 og 9, indlæs og fortsæt\n" +"med at spille. Hvis GAME ikke er angivet, så start et nyt spil.\n" +"\n" + +#. TRANSLATORS: The first %s is the proper name of the package +#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is +#. the e-mail address for reporting bugs. Please add ANOTHER +#. line with the (translated) text "Report translation bugs to +#.
\n", with ADDRESS replaced with either an e-mail +#. address or web URL for reporting bugs in your translation. +#: src/trader.c:334 +#, c-format +msgid "Report bugs to %s <%s>.\n" +msgstr "" +"Rapporter fejl til %s <%s>.\n" +"Rapporter oversættelsefejl til Dansk-gruppen .\n" + +#. TRANSLATORS: %s is the e-mail address for reporting bugs. As +#. with the previous string, please add ANOTHER line with the +#. (translated) text "Report translation bugs to
\n", +#. with ADDRESS replaced with either an e-mail address or web URL +#. for reporting bugs in your translation. +#: src/trader.c:341 +#, c-format +msgid "Report bugs to <%s>.\n" +msgstr "" +"Rapporter fejl til <%s>.\n" +"Rapporter oversættelsefejl til Dansk-gruppen .\n" + +#. TRANSLATORS: The first %s is for packagers and may be +#. something like "Debian". +#: src/trader.c:346 +#, c-format +msgid "Report %s bugs to <%s>.\n" +msgstr "Rapporter fejl for %s til <%s>.\n" + +#: src/trader.c:349 +#, c-format +msgid "Star Traders home page: <%s>.\n" +msgstr "Hjemmeside for Star Traders: <%s>.\n" + +#. TRANSLATORS: The eight company names do NOT have to be literal +#. translations of the English names. In fact, if possible, the +#. names should start with successive letters of your alphabet (in +#. English, for example, "A" to "H"), and, ideally, be related to +#. constellations or stars in our galaxy. No company name should be +#. more than 24 characters (column positions, to be precise) long. +#: src/globals.c:47 +msgid "Altair Starways" +msgstr "Andalens stjernefirma" + +#: src/globals.c:48 +msgid "Betelgeuse, Ltd" +msgstr "Bredevang ApS" + +#: src/globals.c:49 +msgid "Capella Freight Co" +msgstr "Capellefragtfirmaet" + +#: src/globals.c:50 +msgid "Denebola Shippers" +msgstr "Denebola" + +#: src/globals.c:51 +msgid "Eridani Expediters" +msgstr "Eridani" + +#: src/globals.c:52 +msgid "Fornax Express" +msgstr "Fornaxekspressen" + +#: src/globals.c:53 +msgid "Gemeni Inc" +msgstr "Gemini A/S" + +#: src/globals.c:54 +msgid "Hercules and Co" +msgstr "Herkules og søn" + +#. TRANSLATORS: This string specifies the keycodes (keyboard input +#. codes) used to enter the Stock Transaction window for each +#. company. There must be exactly eight characters, one for each +#. company in order, before the ASCII vertical line "|"; these must +#. be EITHER all in upper-case or all in lower-case. If at all +#. possible, these should be successive letters in your alphabet (in +#. English, "A" to "H"). Do NOT use digits or control characters. +#. Do not change or translate anything after the vertical line. +#: src/globals.c:68 +msgid "ABCDEFGH|input|Companies" +msgstr "ABCDEFGH|input|Companies" + +#. TRANSLATORS: This string specifies the keycodes used to select a +#. game move. There must be exactly 20 characters, one for each +#. move, before the ASCII vertical line "|"; these must be EITHER all +#. in upper-case or all in lower-case. If at all possible, these +#. should be successive letters in your alphabet. Do NOT use digits +#. or control characters. Do not change or translate anything after +#. the vertical line. +#: src/globals.c:80 +msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves" +msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves" + +#. TRANSLATORS: This string is used to display the galaxy map to +#. screen. There must be exactly 11 characters before the ASCII +#. vertical line. The first ("." in English) is used for empty +#. space, the second ("+") for outposts, the third ("*") for stars, +#. the remaining for the eight companies. Do not change or translate +#. anything after the vertical line. Double-width characters ARE +#. handled correctly. +#: src/globals.c:92 +msgid ".+*ABCDEFGH|output|MapVals" +msgstr ".+*ABCDEFGH|output|MapVals" + +#. TRANSLATORS: This string is used to display the game moves +#. (choices). There must be exactly 20 characters (NUMBER_MOVES) +#. before the ASCII vertical line. The first character corresponds +#. to the first character in the "input|GameMoves" string, and so on. +#. Do not change or translate anything after the vertical line. +#. Double-width characters ARE handled correctly. +#: src/globals.c:103 +msgid "abcdefghijklmnopqrst|output|GameMoves" +msgstr "abcdefghijklmnopqrst|output|GameMoves" + +#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the +#. Game Winner dialog box at the end of the game. If ordinals depend +#. on the gender of the player, it may be simpler to list cardinal +#. numbers instead (eg, "No. 1"). Up to five characters are allowed +#. (see ORDINAL_COLS in src/intf.h). +#: src/globals.c:114 +msgid "1st" +msgstr "1." + +#: src/globals.c:115 +msgid "2nd" +msgstr "2." + +#: src/globals.c:116 +msgid "3rd" +msgstr "3." + +#: src/globals.c:117 +msgid "4th" +msgstr "4." + +#: src/globals.c:118 +msgid "5th" +msgstr "5." + +#: src/globals.c:119 +msgid "6th" +msgstr "6." + +#: src/globals.c:120 +msgid "7th" +msgstr "7." + +#: src/globals.c:121 +msgid "8th" +msgstr "8." + +#: src/game.c:117 src/game.c:152 +#, c-format +msgid "Loading game %d... " +msgstr "Indlæser spil %d ... " + +#: src/game.c:226 +#, c-format +msgid " First Player " +msgstr " Første spiller " + +#: src/game.c:227 +#, c-format +msgid "The first player to go is ^{%ls^}." +msgstr "Den første spiller er ^{%ls^}." + +#. TRANSLATORS: The keycode should be modified to +#. match that (or those) specified with msgctxt +#. "input|ContinueGame". +#: src/game.c:259 +#, c-format +msgid "Enter number of players [^{1^}-^{%d^}] or ^{^} to continue a game: " +msgstr "Indtast antallet af spillere [^{1^}-^{%d^}] eller ^{^} for at fortsætte et spil: " + +#. TRANSLATORS: This string specifies the keycodes used to continue a +#. game; these must NOT contain any numeric digit from 1 to 9. The +#. first character (keyboard input code) is used to print the user's +#. response if one of those keys is pressed. Both upper and +#. lower-case versions should be present. +#: src/game.c:276 +msgctxt "input|ContinueGame" +msgid "Cc" +msgstr "Cc" + +#: src/game.c:341 src/move.c:399 +#, c-format +msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " +msgstr "Indtast spilnummer [^{1^}-^{9^}] eller ^{^} for at afbryde: " + +#: src/game.c:406 +#, c-format +msgid "Please enter your name: " +msgstr "Indtast dit navn: " + +#: src/game.c:425 +#, c-format +msgid "Do you need any instructions? [^{Y^}/^{N^}] " +msgstr "Har du brug for instruktioner? [^{J^}/^{N^}] " + +#: src/game.c:443 +#, c-format +msgid " Enter Player Names " +msgstr " Indtast spillernavne " + +#: src/game.c:451 +#, c-format, range: 1..8 +msgid "Player %d: " +msgstr "Spiller %d: " + +#: src/game.c:529 +#, c-format +msgid "Does any player need instructions? [^{Y^}/^{N^}] " +msgstr "Har en spiller brug for instruktioner? [^{J^}/^{N^}] " + +#: src/game.c:563 +#, c-format +msgid " Game Over " +msgstr " Spillet er slut " + +#: src/game.c:564 +#, c-format +msgid "The game is over after one turn." +msgid_plural "The game is over after %d turns." +msgstr[0] "Spillet er slut efter en runde." +msgstr[1] "Spillet er slut efter %d runder." + +#: src/game.c:575 +#, c-format +msgid " Total Value " +msgstr " Samlet formue " + +#: src/game.c:577 +#, c-format +msgid "Your total value was ^{%N^}." +msgstr "Din samlede formue var ^{%N^}." + +#: src/game.c:588 +#, c-format +msgid "" +"The winner is ^{%ls^}\n" +"who is ^[*** BANKRUPT ***^]" +msgstr "" +"Vinderen er ^{%ls^}\n" +"som er ^[*** KONKURS ***^]" + +#: src/game.c:591 +#, c-format +msgid "" +"The winner is ^{%ls^}\n" +"with a value of ^{%N^}." +msgstr "" +"Vinderen er ^{%ls^}\n" +"med en formue på ^{%N^}." + +#: src/game.c:597 +#, c-format +msgid " Game Winner " +msgstr " Spillets vinder " + +#. TRANSLATORS: "Player" is used as a column title in a +#. table containing all player names. +#: src/game.c:606 src/move.c:868 +#, c-format +msgctxt "subtitle" +msgid "Player" +msgstr "Spiller" + +#. TRANSLATORS: "Total Value" refers to the total worth +#. (shares, cash and debt) of any given player. %ls is the +#. currency symbol of the current locale. +#: src/game.c:611 +#, c-format +msgctxt "subtitle" +msgid "Total Value (%ls)" +msgstr "Samlet formue (%ls)" + +#: src/game.c:645 src/game.c:695 src/exch.c:100 +#, c-format +msgid "Player: ^{%ls^}" +msgstr "Spiller: ^{%ls^}" + +#: src/game.c:648 +#, c-format +msgid " Turn: ^{%d^} " +msgstr " Runde: ^{%d^} " + +#: src/game.c:649 +#, c-format +msgid " ^[*** Last Turn ***^] " +msgstr " ^[*** Sidste runde ***^] " + +#: src/game.c:693 +#, c-format +msgid " Stock Portfolio " +msgstr " Aktieportefølje " + +#. TRANSLATORS: The current player is bankrupt (has no +#. shares or cash, ie, whose total value is zero) +#: src/game.c:702 +#, c-format +msgid "^[* * * B A N K R U P T * * *^]" +msgstr "^[* * * K O N K U R S * * *^]" + +#: src/game.c:717 src/exch.c:112 +#, c-format +msgid "No companies on the map" +msgstr "Ingen firmaer på kortet" + +#. TRANSLATORS: "Company" is a two-line column label in +#. a table containing a list of companies. +#: src/game.c:725 src/exch.c:120 +#, c-format +msgctxt "subtitle" +msgid "" +"\n" +"Company" +msgstr "" +"\n" +"Firma" + +#. TRANSLATORS: "Ownership" is a two-line column label +#. in a table containing the current player's +#. percentage ownership in any given company. The +#. maximum column width is 10 characters (see +#. OWNERSHIP_COLS in src/intf.h). +#: src/game.c:732 +#, c-format +msgctxt "subtitle" +msgid "" +"Ownership\n" +"(%%)" +msgstr "" +"Ejerskab\n" +"(%%)" + +#. TRANSLATORS: "Holdings" is a two-line column label +#. in a table containing the number of shares the +#. current player owns in any given company. The +#. maximum column width is 10 characters (see +#. STOCK_OWNED_COLS in src/intf.h). +#: src/game.c:739 +#, c-format +msgctxt "subtitle" +msgid "" +"Holdings\n" +"(shares)" +msgstr "" +"Depot\n" +"(aktier)" + +#. TRANSLATORS: "Return" is a two-line column label in +#. a table containing the share return as a percentage +#. in any given company. The maximum column width is +#. 10 characters (see SHARE_RETURN_COLS in src/intf.h). +#: src/game.c:746 src/exch.c:141 +#, c-format +msgctxt "subtitle" +msgid "" +"Return\n" +"(%%)" +msgstr "" +"Udbytte\n" +"(%%)" + +#. TRANSLATORS: "Price per share" is a two-line column +#. label in a table containing the price per share in +#. any given company. %ls is the currency symbol in +#. the current locale. The maximum column width is 12 +#. characters INCLUDING the currency symbol (see +#. SHARE_PRICE_COLS in src/intf.h). +#: src/game.c:755 src/exch.c:150 +#, c-format +msgctxt "subtitle" +msgid "" +"Price per\n" +"share (%ls)" +msgstr "" +"Pris per\n" +"aktie (%ls)" + +#. TRANSLATORS: The "Total value", "Current cash", +#. "Current debt" and "Interest rate" labels MUST all be +#. the same length (ie, right-padded with spaces as +#. needed) and must have at least one trailing space so +#. that the display routines work correctly. The maximum +#. length of each label is 36 characters. +#. +#. Note that some of these labels are used for both the +#. Player Status window and the Trading Bank window. +#: src/game.c:796 +#, c-format +msgctxt "label" +msgid "Total value: " +msgstr "Samlet formue: " + +#: src/game.c:800 src/exch.c:324 +#, c-format +msgctxt "label" +msgid "Current cash: " +msgstr "Kontanter: " + +#: src/game.c:807 src/exch.c:332 +#, c-format +msgctxt "label" +msgid "Current debt: " +msgstr "Gæld: " + +#: src/game.c:813 src/exch.c:337 +#, c-format +msgctxt "label" +msgid "Interest rate: " +msgstr "Rente: " + +#. TRANSLATORS: Each label may be up to 37 characters wide +#. (for <1> and <2>) or 38 characters wide (for <3> and +#. ). The sequences "^{" and "^}" change the +#. character rendition (attributes) and take up no space. +#: src/move.c:243 src/exch.c:182 +#, c-format +msgid "^{<1>^} Display stock portfolio" +msgstr "^{<1>^} Vis aktieportefølje" + +#: src/move.c:245 +#, c-format +msgid "^{<2>^} Declare bankruptcy" +msgstr "^{<2>^} Erklær konkurs" + +#: src/move.c:247 +#, c-format +msgid "^{<3>^} Save and end the game" +msgstr "^{<3>^} Gem og afslut spillet" + +#: src/move.c:249 +#, c-format +msgid "^{^} Quit the game" +msgstr "^{^} Afslut spillet" + +#. TRANSLATORS: The maximum column width is 38 characters, +#. including the trailing space. The sequences "^{", "^}", +#. "^[" and "^]" do not take up any room. "%lc" takes up +#. either one or two columns, depending on the appropriate +#. "output|GameMoves" string in the current PO file. +#: src/move.c:258 +#, c-format +msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " +msgstr "Vælg handling [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " + +#. TRANSLATORS: A game usually consists of +#. DEFAULT_MAX_TURN (50) turns. On each +#. turn, the computer randomly selects +#. NUMBER_MOVES (20) moves (positions on the +#. map); each player selects just one move +#. per turn. "Move" refers to the player's +#. choice. +#: src/move.c:295 +#, c-format +msgid "Move ^{%lc^}" +msgstr "Handling ^{%lc^}" + +#: src/move.c:316 +#, c-format +msgid "^{<2>^} (Declare bankruptcy)" +msgstr "^{<2>^} (Erklær konkurs)" + +#: src/move.c:325 +#, c-format +msgid "^{<3>^} (Save and end the game)" +msgstr "^{<3>^} (Gem og afslut spillet)" + +#: src/move.c:346 +#, c-format +msgid "^{^} (Quit the game)" +msgstr "^{^} (Afslut spillet)" + +#: src/move.c:361 +#, c-format +msgid "Are you sure? [^{Y^}/^{N^}] " +msgstr "Er du sikker? [^{J^}/^{N^}] " + +#: src/move.c:378 src/move.c:456 +#, c-format +msgid "Saving game %d... " +msgstr "Gemmer spil %d ... " + +#: src/move.c:686 src/move.c:694 src/move.c:1052 src/move.c:1089 +#, c-format +msgid " Bankruptcy Court " +msgstr " Konkursretten " + +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:688 +#, c-format +msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." +msgstr "%ls er blevet erklæret konkurs af Den Interstellare Handelsbank." + +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:696 +#, c-format +msgid "%ls has declared bankruptcy." +msgstr "%ls er blevet erklæret konkurs." + +#: src/move.c:764 +#, c-format +msgid " New Company " +msgstr " Nyt firma " + +#: src/move.c:765 +#, c-format +msgid "" +"A new company has been formed!\n" +"Its name is ^{%ls^}." +msgstr "" +"Et nyt firma er blevet dannet!\n" +"Dets navn er ^{%ls^}." + +#: src/move.c:824 +#, c-format +msgid "" +"^{%ls^} has just merged into ^{%ls^}.\n" +"Please note the following transactions:\n" +msgstr "" +"^{%ls^} er blevet fusioneret med ^{%ls^}.\n" +"Bemærk venligst de følgende transaktioner:\n" + +#: src/move.c:830 +#, c-format +msgid " Company Merger " +msgstr " Firmafusion " + +#. TRANSLATORS: "Old stock" refers to the company that has +#. just ceased existence due to a merger. +#. +#. Note that the "Old stock" and "New stock" labels MUST be +#. the same length and must contain a trailing space for the +#. display routines to work correctly. The maximum length of +#. each label is 36 characters. +#: src/move.c:850 +#, c-format +msgctxt "label" +msgid "Old stock: " +msgstr "Gammel aktie: " + +# husk skal være samme længde som ovenstående!!! +#. TRANSLATORS: "New stock" refers to the company that has +#. absorbed the other due to a merger. +#: src/move.c:861 +#, c-format +msgctxt "label" +msgid "New Stock: " +msgstr "Ny aktie: " + +#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to +#. each player after two companies merge. %ls is the currency +#. symbol in the current locale. The maximum column width is +#. 12 characters INCLUDING the currency symbol (see +#. MERGE_BONUS_COLS in src/intf.h). +#: src/move.c:875 +#, c-format +msgctxt "subtitle" +msgid "Bonus (%ls)" +msgstr "Bonus (%ls)" + +#. TRANSLATORS: "Total" refers to the total number of shares in +#. the new company after a merger. The maximum column width is +#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). +#: src/move.c:880 +#, c-format +msgctxt "subtitle" +msgid "Total" +msgstr "I alt" + +#. TRANSLATORS: "New" refers to how many (new) shares each +#. player receives in the surviving company after a merger. +#. The maximum column width is 8 characters (see +#. MERGE_NEW_STOCK_COLS in src/intf.h). +#: src/move.c:887 +#, c-format +msgctxt "subtitle" +msgid "New" +msgstr "Nye" + +# måske også tidligere kunne bruges, men det er for langt!!! +# ordet skal også bruges i de efterfølgende sætninger. +#. TRANSLATORS: "Old" refers to how many shares each player had +#. in the company ceasing existence. The maximum column width +#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). +#: src/move.c:893 +#, c-format +msgctxt "subtitle" +msgid "Old" +msgstr "Gammel" + +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1054 +#, c-format +msgid "" +"%ls has been declared bankrupt by the Interstellar Trading Bank.\n" +"\n" +"^{All assets have been taken to repay outstanding loans.^}" +msgstr "" +"%ls er blevet erklæret konkurs af Den Interstellare Handelsbank.\n" +"\n" +"^{Alle aktiver er blevet beslaglagt som betaling for udestående lån.^}" + +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1078 +#, c-format +msgid "" +"%ls has been declared bankrupt by the Interstellar Trading Bank.\n" +"\n" +"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}" +msgstr "" +"%ls er blevet erklæret konkurs af Den Interstellare Handelsbank.\n" +"\n" +"^{Banken har indvilliget i at betale aktionærerne ^}%.2f%%^{ af aktieværdien på hver ejet aktie.^}" + +#. TRANSLATORS: The label "Amount paid per share" +#. refers to payment made by the Interstellar +#. Trading Bank to each player upon company +#. bankruptcy. This label MUST be the same +#. length as "Old share value" and MUST have at +#. least one trailing space for the display +#. routines to work correctly. The maximum +#. length is 28 characters. +#: src/move.c:1106 +#, c-format +msgctxt "label" +msgid "Amount paid per share: " +msgstr "Beløb betalt per aktie: " + +#. TRANSLATORS: "Old share value" refers to the +#. share price of a company before it was forced +#. into bankruptcy by the Bank. This label must be +#. the same width as "Amount paid per share". +#: src/move.c:1114 +#, c-format +msgctxt "label" +msgid "Old share value: " +msgstr "Gammel aktieværdi: " + +#: src/move.c:1197 src/move.c:1232 src/exch.c:321 +#, c-format +msgid " Interstellar Trading Bank " +msgstr " Den Interstellare Handelsbank " + +#: src/move.c:1199 +#, c-format +msgid "" +"You were forced to borrow %N\n" +"to cover losses from company shares." +msgstr "" +"Du blev tvunget til at låne %N\n" +"for at dække tabene fra dine firmaaktier." + +#: src/move.c:1234 +#, c-format +msgid "" +"Your debt has amounted to %N!\n" +"^{The Bank has impounded ^}%N^{ from your cash.^}" +msgstr "" +"Din gæld er opgjort til %N!\n" +"^{Banken har reserveret ^}%N^{ fra din kontantbeholdning.^}" + +#: src/exch.c:98 +#, c-format +msgid " Interstellar Stock Exchange " +msgstr " Den Interstellare Aktiebørs " + +#. TRANSLATORS: "Shares left" is a two-line column +#. label in a table containing the number of shares +#. left to be purchased in any given company. The +#. maximum column width is 10 characters (see +#. STOCK_LEFT_COLS in src/intf.h). +#: src/exch.c:127 +#, c-format +msgctxt "subtitle" +msgid "" +"Shares\n" +"left" +msgstr "" +"Aktier\n" +"tilbage" + +#. TRANSLATORS: "Shares issued" is a two-line column +#. label in a table containing the number of shares +#. already sold (ie, bought by all players) in any +#. given company. The maximum column width is 10 +#. characters (see STOCK_ISSUED_COLS in src/intf.h). +#: src/exch.c:134 +#, c-format +msgctxt "subtitle" +msgid "" +"Shares\n" +"issued" +msgstr "" +"Aktier\n" +"udstedt" + +#. TRANSLATORS: Each label may be up to 37 characters wide +#. (for <1> and <2>) or 38 characters wide (for <3> and <4>). +#: src/exch.c:186 +#, c-format +msgid "^{<2>^} Display galaxy map" +msgstr "^{<2>^} Vis galaksekort" + +#: src/exch.c:188 +#, c-format +msgid "^{<3>^} Visit the Trading Bank" +msgstr "^{<3>^} Besøg Handelsbanken" + +#: src/exch.c:190 +#, c-format +msgid "^{<4>^} Exit the Stock Exchange" +msgstr "^{<4>^} Forlad aktiebørsen" + +#: src/exch.c:193 +#, c-format +msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " +msgstr "Indtast valg [^[Firmabogstav^]/^{1^}-^{4^}]: " + +#. TRANSLATORS: The "Total value", "Current cash", "Current +#. debt", "Interest rate" and "Credit limit" labels MUST all be +#. the same length (ie, right-padded with spaces as needed) and +#. must have at least one trailing space so that the display +#. routines work correctly. The maximum length of each label +#. is 36 characters. +#. +#. Note that some of these labels are used for both the Player +#. Status window and the Trading Bank window. +#: src/exch.c:351 +#, c-format +msgctxt "label" +msgid "Credit limit: " +msgstr "Kreditbegr.: " + +#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit +#. from the Bank" menu options must all be the same length +#. (ie, padded with trailing spaces as required). The maximum +#. length is 72 characters. +#: src/exch.c:366 +#, c-format +msgid "^{<1>^} Borrow money " +msgstr "^{<1>^} Lån penge " + +#: src/exch.c:368 +#, c-format +msgid "^{<2>^} Repay debt " +msgstr "^{<2>^} Tilbagebetal gæld " + +#: src/exch.c:370 +#, c-format +msgid "^{<3>^} Exit from the Bank" +msgstr "^{<3>^} Forlad banken " + +#: src/exch.c:373 +#, c-format +msgid "Enter selection [^{1^}-^{3^}]: " +msgstr "Indtast valg [^{1^}-^{3^}]: " + +#: src/exch.c:426 +#, c-format +msgid " Insufficient Credit Limit " +msgstr " Kreditten er ikke tilstrækkelig " + +#: src/exch.c:427 +#, c-format +msgid "The Bank will not lend you any more money." +msgstr "Banken vil ikke lade dig låne flere penge." + +#: src/exch.c:447 +#, c-format +msgid "How much do you wish to borrow? " +msgstr "Hvor meget ønsker du at låne? " + +#: src/exch.c:479 +#, c-format +msgid " No Debt " +msgstr " Ingen gæld " + +#: src/exch.c:480 +#, c-format +msgid "You have no debt to repay." +msgstr "Du har ingen gæld at tilbagebetale" + +#: src/exch.c:484 +#, c-format +msgid " No Cash " +msgstr " Ingen kontanter " + +#: src/exch.c:485 +#, c-format +msgid "You have no cash with which to repay the debt!" +msgstr "Du har ingen kontanter til at tilbagebetale gælden!" + +#: src/exch.c:505 +#, c-format +msgid "How much do you wish to repay? " +msgstr "Hvor meget ønsker du at betale tilbage? " + +#. TRANSLATORS: %ls represents the company name. +#: src/exch.c:581 +#, c-format +msgid " Stock Transaction in %ls " +msgstr " Aktietransaktion i %ls " + +#. TRANSLATORS: "Shares issued" represents the number of +#. shares already sold by the company to all players. +#. +#. Note that the labels "Shares issued", "Shares left", +#. "Price per share" and "Return" must all be the same length +#. and must have at least one trailing space for the output +#. routines to work correctly. The maximum length of each +#. label is 22 characters. +#: src/exch.c:592 +#, c-format +msgctxt "label|Stock A" +msgid "Shares issued: " +msgstr "Udstedte aktier: " + +#. TRANSLATORS: "Shares left" is the number of shares that are +#. left to be purchased in the current company. +#: src/exch.c:600 +#, c-format +msgctxt "label|Stock A" +msgid "Shares left: " +msgstr "Tilbagev. aktier " + +#. TRANSLATORS: "Price per share" is the cost of each share in +#. the current company. +#: src/exch.c:607 +#, c-format +msgctxt "label|Stock A" +msgid "Price per share: " +msgstr "Pris per aktie: " + +#. TRANSLATORS: "Return" is the share return as a percentage. +#: src/exch.c:613 +#, c-format +msgctxt "label|Stock A" +msgid "Return: " +msgstr "Forrentning: " + +#. TRANSLATORS: "Current holdings" is the number of shares the +#. current player owns in this particular company. +#. +#. Note that the labels "Current holdings", "Percentage owned" +#. and "Current cash" MUST all be the same length and contain at +#. least one trailing space for the display routines to work +#. correctly. The maximum length of each label is 18 +#. characters. +#: src/exch.c:626 +#, c-format +msgctxt "label|Stock B" +msgid "Current holdings: " +msgstr "Aktuel beholdning:" + +#. TRANSLATORS: "Percentage owned" is the current player's +#. percentage ownership in this particular company. +#: src/exch.c:633 +#, c-format +msgctxt "label|Stock B" +msgid "Percentage owned: " +msgstr "Procent ejet: " + +#: src/exch.c:638 +#, c-format +msgctxt "label|Stock B" +msgid "Current cash: " +msgstr "Kontanter: " + +#. TRANSLATORS: Each label may be up to 35 characters wide +#. (for <1> and <2>) or 36 characters wide (for <3> and <4>). +#: src/exch.c:651 +#, c-format +msgid "^{<1>^} Buy stock from company" +msgstr "^{<1>^} Køb aktie fra firma" + +#: src/exch.c:653 +#, c-format +msgid "^{<2>^} Sell stock back to company" +msgstr "^{<2>^} Sælg aktie tilbage fra firma" + +#: src/exch.c:655 +#, c-format +msgid "^{<3>^} Bid company to issue more shares" +msgstr "^{<3>^} Anmod firma om at udstede flere aktier" + +#: src/exch.c:657 +#, c-format +msgid "^{<4>^} Exit to the Stock Exchange" +msgstr "^{<4>^} Forlad og gå til aktiebørsen" + +#: src/exch.c:660 +#, c-format +msgid "Enter selection [^{1^}-^{4^}]: " +msgstr "Indtast valg [^{1^}-^{4^}]: " + +#: src/exch.c:716 +#, c-format +msgid " No Shares Available " +msgstr " Ingen aktier tilgængelige " + +#: src/exch.c:717 +#, c-format +msgid "No more shares are available for purchase." +msgstr "Der er ikke yderligere aktier tilgængelige for køb." + +#: src/exch.c:721 +#, c-format +msgid " Insufficient Cash " +msgstr " Ikke nok kontanter " + +#: src/exch.c:722 +#, c-format +msgid "" +"You do not have enough cash\n" +"to purchase additional shares." +msgstr "" +"Du har ikke nok kontanter\n" +"til yderligere aktiekøb." + +#: src/exch.c:733 +#, c-format +msgid "You can purchase ^{one^} share." +msgid_plural "You can purchase up to ^{%'ld^} shares." +msgstr[0] "Du kan købe ^{en^} share." +msgstr[1] "Du kan købe op til ^{%'ld^} aktier." + +#: src/exch.c:739 +#, c-format +msgid "How many shares do you wish to purchase? " +msgstr "Hvor mange aktier ønsker du at købe? " + +#: src/exch.c:760 +#, c-format +msgid " No Shares " +msgstr " Ingen aktier " + +#: src/exch.c:761 +#, c-format +msgid "You do not have any shares to sell." +msgstr "Du har ingen aktier at sælge." + +#: src/exch.c:768 +#, c-format +msgid "You can sell ^{one^} share." +msgid_plural "You can sell up to ^{%'ld^} shares." +msgstr[0] "Du kan sælge ^{en^} aktie." +msgstr[1] "Du kan sælge op til ^{%'ld^} aktier." + +#: src/exch.c:774 +#, c-format +msgid "How many shares do you wish to sell? " +msgstr "Hvor mange aktier ønsker du at sælge? " + +#: src/exch.c:802 +#, c-format +msgid " No Shares Issued " +msgstr " Ingen aktier udstedt " + +#. TRANSLATORS: %ls represents the company name. +#: src/exch.c:804 +#, c-format +msgid "" +"%ls has refused\n" +"to issue more shares." +msgstr "" +"%ls har nægtet\n" +"at udstede flere aktier." + +#: src/exch.c:809 +#, c-format +msgid " Shares Issued " +msgstr " Aktier udstedt " + +#. TRANSLATORS: %ls represents the company name. +#: src/exch.c:811 +#, c-format +msgid "" +"%ls has issued\n" +"^{one^} more share." +msgid_plural "" +"%ls has issued\n" +"^{%'ld^} more shares." +msgstr[0] "" +"%ls har udstedt\n" +"^{en^} yderligere aktie." +msgstr[1] "" +"%ls har udstedt\n" +"^{%'ld^} yderligere aktier." + +#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#, c-format +msgid "%s: missing field on line %d" +msgstr "%s: manglende felt på linje %d" + +#: src/fileio.c:60 +#, c-format +msgid "%s: illegal field on line %d: `%s'" +msgstr "%s: ugyldigt felt på linje %d: »%s«" + +#: src/fileio.c:64 +#, c-format +msgid "%s: illegal value on line %d: `%s'" +msgstr "%s: ugyldigt felt på linje %d: »%s«" + +#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 +#, c-format +msgid "%s: illegal value on line %d" +msgstr "%s: ugyldig værdi på linje %d" + +#: src/fileio.c:103 +#, c-format +msgid "%s: illegal characters on line %d" +msgstr "%s: ugyldige tegn på linje %d" + +#: src/fileio.c:184 +#, c-format +msgid "%s: could not convert string" +msgstr "%s: kunne ikke konvertere streng" + +#: src/fileio.c:255 +#, c-format +msgid " Game Not Found " +msgstr " Spil blev ikke fundet " + +#: src/fileio.c:256 +#, c-format +msgid "Game %d has not been saved to disk." +msgstr "Spillet %d er ikke blevet gemt til harddisken." + +#: src/fileio.c:263 +#, c-format +msgid " Game Not Loaded " +msgstr " Spil blev ikke indlæst " + +#: src/fileio.c:264 +#, c-format +msgid "" +"Game %d could not be loaded from disk.\n" +"\n" +"^{File %s: %s^}" +msgstr "" +"Spillet %d kunne ikke indlæses fra harddisken.\n" +"\n" +"^{Fil %s: %s^}" + +#: src/fileio.c:316 +#, c-format +msgid "%s: missing header in game file" +msgstr "%s: mangler hoved i spilfil" + +#: src/fileio.c:319 +#, c-format +msgid "%s: not a valid game file" +msgstr "%s: ikke en gyldig spilfil" + +#: src/fileio.c:322 src/fileio.c:329 +#, c-format +msgid "%s: missing subheader in game file" +msgstr "%s: mangler underhoved i spilfil" + +#: src/fileio.c:325 +#, c-format +msgid "%s: saved under a different version of Star Traders" +msgstr "%s: gemt under en anden version af Star Traders" + +#: src/fileio.c:332 +#, c-format +msgid "%s: saved under an incompatible character encoding" +msgstr "%s: gemt med en tegnkodning der ikke er kompatibel" + +#: src/fileio.c:340 +#, c-format +msgid "%s: illegal or missing field on line %d" +msgstr "%s: ugyldigt eller manglende felt på linje %d" + +#: src/fileio.c:384 +#, c-format +msgid "%s: illegal field on line %d" +msgstr "%s: ugyldigt felt på linje %d" + +#: src/fileio.c:466 src/fileio.c:487 +#, c-format +msgid " Game Not Saved " +msgstr " Spil blev ikke gemt " + +#: src/fileio.c:467 +#, c-format +msgid "" +"Game %d could not be saved to disk.\n" +"\n" +"^{Directory %s: %s^}" +msgstr "" +"Spillet %d kunne ikke gemmes til harddisken.\n" +"\n" +"^{Mappe %s: %s^}" + +#: src/fileio.c:488 +#, c-format +msgid "" +"Game %d could not be saved to disk.\n" +"\n" +"^{File %s: %s^}" +msgstr "" +"Spillet %d kunne ikke gemmes til harddisken.\n" +"\n" +"^{Fil %s: %s^}" + +#. TRANSLATORS: The help text for Star Traders is marked up using a +#. custom mark-up format NOT used anywhere else in the source code. +#. +#. Each string is a single page of text that is displayed in an area 76 +#. columns wide by 16 lines high. Each line is delimited by "\n". NO +#. word-wrapping is performed: you must place the "\n" characters in the +#. appropriate place. Ideally, each line within the string should be +#. also (manually) space-justified or centred. TAB characters and other +#. control codes must NOT be used. If a string starts with "@" as the +#. very first character, that string is ignored (as are all strings +#. following): this allows a variable number of help text pages (from +#. one to ten). Multibyte strings are handled correctly (even those +#. requiring shift sequences!). +#. +#. The ASCII circumflex accent character "^" switches to a different +#. character rendition (also called attributes), depending on the +#. character following the "^": +#. +#. ^^ - Print the circumflex accent (ASCII code U+005E) +#. ^N - Switch to using the normal character rendition +#. ^B - Switch to using the bold character rendition +#. ^H - Switch to using the highlight character rendition +#. ^K - Switch to using the keycode character rendition (such as used for "") +#. ^e - Switch to using the character rendition used for empty space +#. ^o - Switch to using the character rendition used for outposts +#. ^s - Switch to using the character rendition used for stars +#. ^c - Switch to using the character rendition used for companies +#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map +#. +#. The help text parsing routines also understand the following "value +#. escapes" introduced by the ASCII tilde character "~"; these act like +#. "%" conversion specifiers in printf(): +#. +#. ~~ - Print the tilde character (ASCII code U+007E) [*] +#. ~x - Print the width of the galaxy map (MAX_X) [**] +#. ~y - Print the height of the galaxy map (MAX_Y) [**] +#. ~m - Print the number of moves available (NUMBER_MOVES) [**] +#. ~c - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*] +#. ~t - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**] +#. ~1 to ~9 - Print the keycode for the N-th choice of move [***] +#. ~M - Print the keycode for the last choice of move [***] +#. ~A to ~H - Print the character used to represent the company on the galaxy map [***] +#. ~. - Print the character used to represent empty space on the map [***] +#. ~+ - Print the character used to represent outposts on the map [***] +#. ~* - Print the character used to represent stars on the map [***] +#. +#. [*] Takes one character space (column space) in the output +#. [**] Takes two column spaces in the output +#. [***] Takes one or two column spaces in the output, depending on the +#. appropriate strings in the current PO file. +#. +#. Note that all keycodes and map representation characters use locale- +#. specific characters; double-width characters ARE supported. Note +#. also that the tilde value escapes do NOT change the current character +#. rendition: a circumflex accent escape is needed for that. For +#. example, to display the first choice of move as it would be shown on +#. the galaxy map, use something like "^k~1^N" (a six-character sequence +#. that would translate to just one character (or maybe two) in the +#. output text). +#. +#. Formatting the help text is probably the most complicated and tedious +#. part of translating Star Traders. The author and maintainer of this +#. game is more than happy to help you with this task: if you are able +#. to provide a translation, even if it is not formatted correctly, the +#. maintainer will perform the necessary adjustments for word-wrapping +#. and justification. In addition, remember that you have up to 10 +#. pages in which to display your help text: the translation does not +#. need to correspond exactly to the original text. This text will not +#. be changing any time soon! +#. +#: src/help.c:113 +msgid "" +"^BStar Traders^N is a simple game of interstellar trading. The object of the\n" +"game is to amass the greatest amount of wealth possible. This is done by\n" +"creating interstellar shipping lanes, expanding them and buying shares in\n" +"the companies controlling them. Shares appreciate in value as company\n" +"operations expand. In addition, the return on each share (as a percentage)\n" +"also changes. Players may also borrow from the Interstellar Trading Bank to\n" +"finance additional purchases on the Stock Exchange.\n" +"\n" +"The map of the galaxy is represented by a ^B~x^N x ^B~y^N grid. A typical section\n" +"of it may be:\n" +"\n" +" ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N represents ^Bempty space^N,\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N ^s ~* ^N represents a ^Bstar^N.\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" +msgstr "" +"^BStar Traders^N er et simpelt spil med rumhandel. Formålet i spillet er at \n" +"samle den størst mulige mængde af rigdom. Dette gøres ved at oprette \n" +"interstellare handelsruter, udvide dem og købe aktier i firmaerne der \n" +"kontrollerer dem. Aktier stiger i værdi efterhånden som firmaets handel \n" +"udvides. Derudover ændres aktiernes udbytte (som en procent) sig også. \n" +"Spillere kan også låne fra Den Interstellare Handelsbank for at finansiere \n" +"yderligere køb på aktiebørsen.\n" +"\n" +"Galaksens kort er repræsenteret ved et ^B~x^N x ^B~y^N-gitter. Et typisk afsnit kan \n" +"se således ud:\n" +"\n" +" ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N repræsent. ^Bempty space^N,\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N ^s ~* ^N repræsent. ^Bstar^N. \n" +" ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" + +#: src/help.c:132 +msgid "" +"The computer selects ^B~m^N moves (labeled ^k~1^N to ^k~M^N) at random, and places these\n" +"on the map. To select any of the highlighted positions, press that letter.\n" +"For example, some of the moves on the map may be:\n" +"\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N Moves ^k~1^N to ^k~5^N shown.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" +"\n" +"\n" +"Selecting a position that is ^Bnot^N next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n" +"will set up an ^Boutpost^N, not belonging to any company. Thus, if move ^k~3^N is\n" +"selected on the above map, a ^o ~+ ^N would be placed at that position.\n" +msgstr "" +"Computeren vælger ^B~m^N handlinger (navngivet ^k~1^N til ^k~M^N) vilkårligt, og placerer \n" +"dem på kortet. For at vælge et af de fremhævede placeringer, så tryk på bogstavet.\n" +"For eksempel kan nogle af handlingerne på kortet være:\n" +"\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N Flytter ^k~1^N til ^k~5^N vist.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" +"\n" +"\n" +"Valg af en position som ^Bikke^N er ved siden af en stjerne (såsom handlingerne ^k~1^N, ^k~3^N \n" +"eller ^k~5^N) vil oprette en ^Bforpost^N, der ikke tilhører noget firma. Hvis handling\n" +"^k~3^N vælges på kortet ovenfor vil en ^o ~+ ^N derfor blive placeret på den placering.\n" + +#: src/help.c:150 +msgid "" +"If, on the other hand, a position next to a star (or another outpost) is\n" +"selected, a ^Bcompany^N would be formed and its letter would appear on the map.\n" +"As a reward for creating the company, you are granted the first five shares.\n" +"Up to ^B~c^N companies can be created in this way.\n" +"\n" +"If a position next to an existing company is selected, the company would\n" +"expand its operations by one square. This increases the cost of its shares\n" +"and hence your return. Thus, if the map was as shown below, selecting ^k~6^N\n" +"or ^k~8^N increases Company ^B~B^N's shipping lane:\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" +msgstr "" +"Hvis på den anden side, en placering ved siden af en stjerne (eller en anden forpost)\n" +"er valgt, så vil et ^Bfirma^N blive dannet og dets bogstav vil fremkomme på kortet.\n" +"Som belønning for at oprette firmaet, modtager du de første fem aktier.\n" +"Op til ^B~c^N firmaer kan oprettes på denne måde.\n" +"\n" +"Hvis en placering ved siden af et eksisterende firma vælges vil firmaet udvide sine\n" +"handlinger med et felt. Dette øger prisen for dets aktier og dermed din forrentning\n" +"Hvis kortet var vist som nedenfor vil valg af ^k~6^N eller ^k~8^N øge^N when asked to select a move. As well, individual\n" +"players can declare themselves bankrupt at any time. If your debt is large\n" +"enough, the Bank may do this for you! If you do not complete your game in\n" +"the time you have available, you may save the game and continue it later.\n" +"\n" +"\n" +"The ^Bwinner of the game^N is the person with the greatest net worth (total\n" +"value of cash, stock and debt). ^HGood luck^N and may the best person win!\n" +msgstr "" +"Når du har valgt din handling, så kommer du til ^BDen Interstellare Aktiebørs^N.\n" +"Her kan du købe aktier, sælge dem, låne fra Handelsbanken eller betale tilbage\n" +"på din gæld (hvis du har gæld). Bemærk at hver firma udsteder et begrænset \n" +"antal aktier - du kan ikke bare købe ind! Du kan dog anmode om, at der bliver\n" +"udstedt flere aktier. Du har en højere sandsynlighed for at få succes, hvis \n" +"du ejer en større andel af firmaet.\n" +"\n" +"Spillet slutter normalt efter ^B~t^N runder. Du kan dog afslutte spillet \n" +"tidligere ved at trykke på ^K^N, når du bliver bedt om en handling.\n" +"Individuelle spillere kan også erklære sig selv konkurs på ethvert tidspunkt.\n" +"Hvis din gæld er stor nok risikerer du, at din bank gør det for dig! Hvis du\n" +"ikke gør spillet færdig i din tilgængelige tid, kan du gemme spillet og\n" +"fortsætte senere.\n" +"\n" +"\n" +"^BVinderen af spillet^N er personen med den største samlede nettoformue (samlet\n" +"værdi for kontanter og aktier minus gæld). ^HHeld og lykke^N og må den bedste\n" +"person vinde!\n" + +#: src/help.c:225 +msgid "@ Help text, page 7\n" +msgstr "@ Hjælpetekst, side 7\n" + +#: src/help.c:226 +msgid "@ Help text, page 8\n" +msgstr "@ Hjælpetekst, side 8\n" + +#: src/help.c:227 +msgid "@ Help text, page 9\n" +msgstr "@ Hjælpetekst, side 9\n" + +#: src/help.c:228 +msgid "@ Help text, page 10\n" +msgstr "@ Hjælpetekst, side 10\n" + +#: src/help.c:280 +#, c-format +msgid " How to Play " +msgstr " Sådan spiller du " + +#. 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 +#, c-format +msgid "Page %d of %d" +msgstr "Side %d af %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 +#, c-format +msgid "[ Press to continue ] " +msgstr "[ Tryk for at fortsætte ] " + +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , +#. , , or instead of +#. , and almost any other key instead of +#. (other than , , , , +#. or <\>). +#: src/help.c:494 +#, c-format +msgid "[ Press to continue or for the previous page ] " +msgstr "[ Tryk for at fortsætte eller for den forrige side ] " + +#: src/intf.c:110 +#, c-format +msgid "%s: string has incorrect format: `%s'" +msgstr "%s: streng har ikke korrekt format: »%s«" + +#: src/intf.c:126 +#, c-format +msgid "%s: character has illegal width: `%lc'" +msgstr "%s: tegn har ugyldig bredde: »%lc«" + +#: src/intf.c:434 +#, c-format +msgid "terminal size is too small (%d x %d required)" +msgstr "terminalstørrelse er for lille (%d x %d krævet)" + +#: src/intf.c:610 +#, c-format +msgid "Star Traders" +msgstr "Star Traders" + +#: src/intf.c:1265 +#, c-format +msgid "mkchstr_conv: NUL" +msgstr "mkchstr_conv: NUL" + +#: src/intf.c:1568 +#, c-format +msgid "mkchstr: `%s'" +msgstr "mkchstr: »%s«" + +#. TRANSLATORS: This string specifies the keycodes used to insert the +#. default value into the input string, if entered as the very first +#. character. Ideally, it should contain an easily-accessible +#. keycode that would NOT be used in ordinary input. Digits, ".", +#. ",", "+" and "-" are definitely NOT acceptable. +#: src/intf.c:2020 +msgctxt "input|DefaultValue" +msgid "=;" +msgstr "=;" + +#: src/intf.c:2034 src/intf.c:2079 +#, c-format +msgid "gettxline: illegal character in string: `%ls'" +msgstr "gettxline: ugyldigt tegn i streng: »%ls«" + +#. TRANSLATORS: The strings with msgctxt "input|Yes" and +#. "input|No" contain the keycodes used to determine whether a +#. user is answering "Yes" or "No" in response to some question. +#. Both upper and lower-case versions should be present. +#: src/intf.c:2952 +msgctxt "input|Yes" +msgid "Yy" +msgstr "Jj" + +#: src/intf.c:2954 +msgctxt "input|No" +msgid "Nn" +msgstr "Nn" + +#. TRANSLATORS: The strings "Yes" and "No" are printed as a +#. response to user input in answer to questions like "Are you +#. sure? [Y/N] " +#: src/intf.c:3005 +msgctxt "answer" +msgid "Yes" +msgstr "Ja" + +#: src/intf.c:3007 +msgctxt "answer" +msgid "No" +msgstr "Nej" + +#: src/utils.c:199 src/utils.c:220 +#, c-format +msgid "%s: " +msgstr "%s: " + +#: src/utils.c:225 +msgid ": " +msgstr ": " + +#: src/utils.c:238 +#, c-format +msgid "out of memory" +msgstr "ikke nok hukommelse" + +#: src/utils.c:571 +#, c-format +msgid "xmbstowcs: `%s'" +msgstr "xmbstowcs: »%s«" + +#: src/utils.c:611 +#, c-format +msgid "xwcrtomb: NUL" +msgstr "xwcrtomb: NUL" + +#: src/utils.c:616 +#, c-format +msgid "xwcrtomb: `%lc'" +msgstr "xwcrtomb: »%lc«" + +#: lib/getopt.c:547 lib/getopt.c:576 +#, c-format +msgid "%s: option '%s' is ambiguous; possibilities:" +msgstr "%s: tilvalg »%s« er tvetydigt: muligheder:" + +#: lib/getopt.c:624 lib/getopt.c:628 +#, c-format +msgid "%s: option '--%s' doesn't allow an argument\n" +msgstr "%s: tilvalg »--%s« tillader ikke et argument\n" + +#: lib/getopt.c:637 lib/getopt.c:642 +#, c-format +msgid "%s: option '%c%s' doesn't allow an argument\n" +msgstr "%s: tilvalg »%c%s« tillader ikke et argument\n" + +#: lib/getopt.c:685 lib/getopt.c:704 +#, c-format +msgid "%s: option '--%s' requires an argument\n" +msgstr "%s: tilvalg »--%s« kræver et argument\n" + +#: lib/getopt.c:742 lib/getopt.c:745 +#, c-format +msgid "%s: unrecognized option '--%s'\n" +msgstr "%s: tilvalg blev ikke genkendt »--%s«\n" + +#: lib/getopt.c:753 lib/getopt.c:756 +#, c-format +msgid "%s: unrecognized option '%c%s'\n" +msgstr "%s: tilvalg blev ikke genkendt »%c%s«\n" + +#: lib/getopt.c:805 lib/getopt.c:808 +#, c-format +msgid "%s: invalid option -- '%c'\n" +msgstr "%s: ugyldigt tilvalg -- »%c«\n" + +#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#, c-format +msgid "%s: option requires an argument -- '%c'\n" +msgstr "%s: tilvalg kræver et argument -- '%c'\n" + +#: lib/getopt.c:934 lib/getopt.c:950 +#, c-format +msgid "%s: option '-W %s' is ambiguous\n" +msgstr "%s: tilvalg »W %s« er tvetydigt\n" + +#: lib/getopt.c:974 lib/getopt.c:992 +#, c-format +msgid "%s: option '-W %s' doesn't allow an argument\n" +msgstr "%s: tilvalg »-W %s« tillader ikke et argument\n" + +#: lib/getopt.c:1013 lib/getopt.c:1031 +#, c-format +msgid "%s: option '-W %s' requires an argument\n" +msgstr "%s: tilvalg »-W %s« kræver et argument\n" From 77b3b17b80ff089dd43facb83083cbf9ff7d377c Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 18 Jan 2013 18:05:25 +1100 Subject: [PATCH 14/39] Add the Danish translation by Joe Hansen --- NEWS | 7 ++++--- po/LINGUAS | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 212bae2..4989741 100644 --- a/NEWS +++ b/NEWS @@ -18,9 +18,10 @@ at http://www.zap.org.au/services/svn/. Version 7.5 (not yet released) ------------------------------ -Added a translation for Norwegian Bokmål, with thanks to Johnny A. Solbu. -Updated auxiliary files to the latest versions available from the Gnulib -GNU Portability Library and the GNU Autoconf project. +Added translations for Norwegian Bokmål and Danish (in that order), with +thanks to Johnny A. Solbu and Joe Hansen. Updated auxiliary files to the +latest versions available from the Gnulib GNU Portability Library and the +GNU Autoconf project. Version 7.4 (9th May, 2012) diff --git a/po/LINGUAS b/po/LINGUAS index 09dbc95..20e471d 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -32,6 +32,7 @@ en_CA en_GB en_US +da de fi fr From d93c8e510b1514127ee1eabecf8e3f45752f7225 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 18 Jan 2013 20:17:50 +1100 Subject: [PATCH 15/39] Update to the latest version of the GNU Portability Library --- lib/.gitignore | 2 ++ m4/.gitignore | 1 + m4/gnulib-cache.m4 | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/.gitignore b/lib/.gitignore index ca9ad40..1964617 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -52,6 +52,7 @@ sys_stat.in.h sys_time.in.h sys_types.in.h time.in.h +unistd.c unistd.in.h unistr.in.h unitypes.in.h @@ -63,6 +64,7 @@ wcsdup.c wctob.c wctomb-impl.h wctomb.c +wctype-h.c wctype.in.h wmemcpy-impl.h wmemcpy.c diff --git a/m4/.gitignore b/m4/.gitignore index b98903d..a16cf9a 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -5,6 +5,7 @@ codeset.m4 config-h.m4 configmake.m4 extensions.m4 +extern-inline.m4 fcntl-o.m4 getopt.m4 gettext.m4 diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index 352eeb7..9a93f9c 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 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 From c25ec91e99cd1dff1da870bab5b4713722c6b7ba Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 2 Feb 2013 10:48:43 +1100 Subject: [PATCH 16/39] Update the copyright year to 2013, and the version number to 7.5 --- COPYING | 2 +- INSTALL | 10 +++++----- Makefile.am | 2 +- NEWS | 2 +- README | 4 ++-- build-aux/README | 2 +- configure.ac | 4 ++-- doc/Makefile.am | 2 +- doc/README | 2 +- doc/trader.6 | 6 +++--- lib/README | 2 +- m4/Makefile.am | 2 +- m4/README | 2 +- po/LINGUAS | 2 +- po/Makevars | 2 +- po/POTFILES.in | 2 +- po/README | 2 +- po/de.po | 6 +++--- po/en_AU.po | 8 ++++---- po/en_CA.po | 8 ++++---- po/en_GB.po | 8 ++++---- po/en_US.po | 8 ++++---- po/fi.po | 6 +++--- po/fr.po | 6 +++--- po/hr.po | 6 +++--- po/nb.po | 6 +++--- po/ru.po | 6 +++--- src/Makefile.am | 2 +- src/README | 2 +- src/exch.c | 2 +- src/exch.h | 2 +- src/fileio.c | 2 +- src/fileio.h | 2 +- src/game.c | 2 +- src/game.h | 2 +- src/globals.c | 2 +- src/globals.h | 2 +- src/help.c | 2 +- src/help.h | 2 +- src/intf.c | 2 +- src/intf.h | 2 +- src/move.c | 2 +- src/move.h | 2 +- src/system.h | 2 +- src/trader.c | 4 ++-- src/trader.h | 2 +- src/utils.c | 2 +- src/utils.h | 2 +- 48 files changed, 81 insertions(+), 81 deletions(-) diff --git a/COPYING b/COPYING index 03b7501..0297f89 100644 --- a/COPYING +++ b/COPYING @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************** diff --git a/INSTALL b/INSTALL index 76424c6..5291295 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************** @@ -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.4, you could run +the Star Traders source code tree in $HOME/src/trader-7.5, you could run something like: - mkdir $HOME/build/trader-build-7.4 - cd $HOME/build/trader-build-7.4 - $HOME/src/trader-7.4/configure + mkdir $HOME/build/trader-build-7.5 + cd $HOME/build/trader-build-7.5 + $HOME/src/trader-7.5/configure Once again, the Autoconf manual describes these options (and many others): diff --git a/Makefile.am b/Makefile.am index 27e2f4c..31d167f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2012, John Zaitseff # +# Copyright (C) 1990-2013, John Zaitseff # # # ######################################################################### diff --git a/NEWS b/NEWS index 4989741..12eeb4d 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************** diff --git a/README b/README index 872d955..1e8e60a 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************** @@ -67,7 +67,7 @@ welcomed! Please send these to: Copyright ========= -Copyright (C) 1990-2012, John Zaitseff. +Copyright (C) 1990-2013, John Zaitseff. Star Traders is free software that is distributed under the terms of the GNU General Public License. You can redistribute it and/or modify it diff --git a/build-aux/README b/build-aux/README index ee5b8ee..c62d777 100644 --- a/build-aux/README +++ b/build-aux/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************** diff --git a/configure.ac b/configure.ac index a17cc81..b2111d0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl ********************************************************************* dnl * * dnl * Star Traders: A Game of Interstellar Trading * -dnl * Copyright (C) 1990-2012, John Zaitseff * +dnl * Copyright (C) 1990-2013, John Zaitseff * dnl * * dnl ********************************************************************* dnl @@ -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.4], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/]) +AC_INIT([Star Traders], [7.5], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/]) AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author]) AC_PREREQ([2.67]) diff --git a/doc/Makefile.am b/doc/Makefile.am index f55e60c..3f8a4f3 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2012, John Zaitseff # +# Copyright (C) 1990-2013, John Zaitseff # # # ######################################################################### diff --git a/doc/README b/doc/README index 7e6788b..dbcff39 100644 --- a/doc/README +++ b/doc/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************** diff --git a/doc/trader.6 b/doc/trader.6 index 43926ee..db18e87 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -1,7 +1,7 @@ .\" ********************************************************************* .\" * * .\" * Star Traders: A Game of Interstellar Trading * -.\" * Copyright (C) 1990-2012, John Zaitseff * +.\" * Copyright (C) 1990-2013, John Zaitseff * .\" * * .\" ********************************************************************* .\" @@ -41,7 +41,7 @@ .if \n[.g] .mso www.tmac .\" .\" ********************************************************************* -.TH TRADER 6 "16th March, 2012" "Unix-like systems" +.TH TRADER 6 "2nd February, 2013" "Unix-like systems" .SH NAME trader \- a game of interstellar trading .\" ********************************************************************* @@ -200,7 +200,7 @@ Australia .PP .\" ********************************************************************* .SH COPYRIGHT -Copyright \(co 1990\-2012, John Zaitseff. +Copyright \(co 1990\-2013, John Zaitseff. .PP \fBStar Traders\fR is free software that is distributed under the terms of the GNU General Public License. You can redistribute it and/or modify diff --git a/lib/README b/lib/README index 2126ec9..9a24d0d 100644 --- a/lib/README +++ b/lib/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************** diff --git a/m4/Makefile.am b/m4/Makefile.am index 4d6fd22..8af21b6 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2012, John Zaitseff # +# Copyright (C) 1990-2013, John Zaitseff # # # ######################################################################### diff --git a/m4/README b/m4/README index 6be4a53..3778fad 100644 --- a/m4/README +++ b/m4/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************** diff --git a/po/LINGUAS b/po/LINGUAS index 20e471d..a22c23e 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2012, John Zaitseff # +# Copyright (C) 1990-2013, John Zaitseff # # # ######################################################################### diff --git a/po/Makevars b/po/Makevars index 04458b0..8352e3f 100644 --- a/po/Makevars +++ b/po/Makevars @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2012, John Zaitseff # +# Copyright (C) 1990-2013, John Zaitseff # # # ######################################################################### diff --git a/po/POTFILES.in b/po/POTFILES.in index abaf6cc..9d5c97d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2012, John Zaitseff # +# Copyright (C) 1990-2013, John Zaitseff # # # ######################################################################### diff --git a/po/README b/po/README index b0ea9dd..44c09da 100644 --- a/po/README +++ b/po/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************** diff --git a/po/de.po b/po/de.po index 5b9d520..a1988a1 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * German Translations for Star Traders * -# * Copyright (C) 2012, John Zaitseff * +# * Copyright (C) 2012-13, John Zaitseff * # * * # ************************************************************************* # @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.4\n" +"Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2012-05-09 07:07+1000\n" +"PO-Revision-Date: 2013-02-02 10:43+1100\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 0c21b8d..e4f7ecd 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (Australian) Translations for Star Traders * -# * Copyright (C) 1990-2012, John Zaitseff * +# * Copyright (C) 1990-2013, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011-12. +# John Zaitseff , 2011-13. # msgid "" msgstr "" -"Project-Id-Version: trader 7.4\n" +"Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2012-05-09 07:07+1000\n" +"PO-Revision-Date: 2013-02-02 10:44+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" "Language: en_AU\n" diff --git a/po/en_CA.po b/po/en_CA.po index 84e149e..9e04532 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (Canadian) Translations for Star Traders * -# * Copyright (C) 1990-2012, John Zaitseff * +# * Copyright (C) 1990-2013, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011-12. +# John Zaitseff , 2011-13. # msgid "" msgstr "" -"Project-Id-Version: trader 7.4\n" +"Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2012-05-09 07:07+1000\n" +"PO-Revision-Date: 2013-02-02 10:44+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" "Language: en_CA\n" diff --git a/po/en_GB.po b/po/en_GB.po index de28966..709071b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (British) Translations for Star Traders * -# * Copyright (C) 1990-2012, John Zaitseff * +# * Copyright (C) 1990-2013, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011-12. +# John Zaitseff , 2011-13. # msgid "" msgstr "" -"Project-Id-Version: trader 7.4\n" +"Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2012-05-09 07:06+1000\n" +"PO-Revision-Date: 2013-02-02 10:45+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" "Language: en_GB\n" diff --git a/po/en_US.po b/po/en_US.po index ea44029..ec2cc99 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (US) Translations for Star Traders * -# * Copyright (C) 1990-2012, John Zaitseff * +# * Copyright (C) 1990-2013, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011-12. +# John Zaitseff , 2011-13. # msgid "" msgstr "" -"Project-Id-Version: trader 7.4\n" +"Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2012-05-09 07:06+1000\n" +"PO-Revision-Date: 2013-02-02 10:45+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" "Language: en_US\n" diff --git a/po/fi.po b/po/fi.po index 3949de7..b34a787 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Finnish Translations for Star Traders * -# * Copyright (C) 2012, John Zaitseff * +# * Copyright (C) 2012-13, John Zaitseff * # * Copyright (C) 2012, Free Software Foundation, Inc. * # * * # ************************************************************************* @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.4\n" +"Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2012-05-09 07:06+1000\n" +"PO-Revision-Date: 2013-02-02 10:46+1100\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" "Language: fi\n" diff --git a/po/fr.po b/po/fr.po index ccdc87c..69e1816 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * French Translations for Star Traders * -# * Copyright (C) 2012, Free Software Foundation, Inc. * +# * Copyright (C) 2012-13, Free Software Foundation, Inc. * # * * # ************************************************************************* # @@ -11,10 +11,10 @@ # Frédéric Marchal , 2012. msgid "" msgstr "" -"Project-Id-Version: trader 7.4\n" +"Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2012-05-09 07:05+1000\n" +"PO-Revision-Date: 2013-02-02 10:46+1100\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 bf98fd8..969cdc0 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Croatian Translations for Star Traders * -# * Copyright (C) 2012, John Zaitseff * +# * Copyright (C) 2012-13, John Zaitseff * # * * # ************************************************************************* # @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.4\n" +"Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2012-05-09 07:05+1000\n" +"PO-Revision-Date: 2013-02-02 10:47+1100\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" "Language: hr\n" diff --git a/po/nb.po b/po/nb.po index 8e1c5b6..8bd14e8 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Norwegian Bokmål Translations for Star Traders * -# * Copyright (C) 2012, John Zaitseff * +# * Copyright (C) 2012-13, John Zaitseff * # * * # ************************************************************************* # @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.4\n" +"Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 13:57+1000\n" -"PO-Revision-Date: 2012-11-08 16:48+0100\n" +"PO-Revision-Date: 2013-02-02 10:47+1100\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 6692042..01cb63f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,7 +2,7 @@ # * * # * Russian Translations for Star Traders * # * Русский перевод для игры «Звёздные торговцы» * -# * Copyright (C) 1990-2012, John Zaitseff * +# * Copyright (C) 1990-2013, John Zaitseff * # * * # ************************************************************************* # @@ -15,10 +15,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.4\n" +"Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2012-05-09 07:05+1000\n" +"PO-Revision-Date: 2013-02-02 10:48+1100\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" "Language: ru\n" diff --git a/src/Makefile.am b/src/Makefile.am index 898b148..b965de6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2012, John Zaitseff # +# Copyright (C) 1990-2013, John Zaitseff # # # ######################################################################### diff --git a/src/README b/src/README index e0657d3..f4ebea4 100644 --- a/src/README +++ b/src/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************** diff --git a/src/exch.c b/src/exch.c index 2192b69..3d5d334 100644 --- a/src/exch.c +++ b/src/exch.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/exch.h b/src/exch.h index e5fd09c..1eebce7 100644 --- a/src/exch.h +++ b/src/exch.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/fileio.c b/src/fileio.c index f3c29e5..7c75cd3 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/fileio.h b/src/fileio.h index 5c503ab..950a6ce 100644 --- a/src/fileio.h +++ b/src/fileio.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/game.c b/src/game.c index 79fa56a..2e6b269 100644 --- a/src/game.c +++ b/src/game.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/game.h b/src/game.h index 4cf7f45..821efac 100644 --- a/src/game.h +++ b/src/game.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/globals.c b/src/globals.c index a8d35f0..9a02541 100644 --- a/src/globals.c +++ b/src/globals.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/globals.h b/src/globals.h index 0a9c12d..c3015bb 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/help.c b/src/help.c index 5e4cb0a..c96d3a5 100644 --- a/src/help.c +++ b/src/help.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/help.h b/src/help.h index 0a54e40..4bd78a7 100644 --- a/src/help.h +++ b/src/help.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/intf.c b/src/intf.c index f482281..3b4ca9b 100644 --- a/src/intf.c +++ b/src/intf.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/intf.h b/src/intf.h index 2983b3a..4afea70 100644 --- a/src/intf.h +++ b/src/intf.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/move.c b/src/move.c index 5a96631..0b2e849 100644 --- a/src/move.c +++ b/src/move.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/move.h b/src/move.h index 7d23f23..21de729 100644 --- a/src/move.h +++ b/src/move.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/system.h b/src/system.h index 8b72b7b..1cc2dd5 100644 --- a/src/system.h +++ b/src/system.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/trader.c b/src/trader.c index b9ab1be..3a578be 100644 --- a/src/trader.c +++ b/src/trader.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ @@ -293,7 +293,7 @@ This program is free software that is distributed under the terms of the\n\ GNU General Public License, version 3 or later. You are welcome to\n\ modify and/or distribute it under certain conditions. This program has\n\ NO WARRANTY, to the extent permitted by law; see the License for details.\n\ -"), program_name, PACKAGE_VERSION, "1990-2012"); +"), program_name, PACKAGE_VERSION, "1990-2013"); exit(EXIT_SUCCESS); } diff --git a/src/trader.h b/src/trader.h index 324dae2..5279136 100644 --- a/src/trader.h +++ b/src/trader.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/utils.c b/src/utils.c index 3354ddd..5f013a8 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ diff --git a/src/utils.h b/src/utils.h index 9c4aded..c874bd1 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2012, John Zaitseff * +* Copyright (C) 1990-2013, John Zaitseff * * * ************************************************************************/ From 9689f2876bb95e0fd14bb26f17cdb8829bd1c394 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 2 Feb 2013 14:42:02 +1100 Subject: [PATCH 17/39] Update the Danish translation Change whitespacing and word-wrapping of help text, change various other strings and add the standard header comment. --- po/da.po | 161 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 76 deletions(-) diff --git a/po/da.po b/po/da.po index a54f85f..1c5eefb 100644 --- a/po/da.po +++ b/po/da.po @@ -1,17 +1,24 @@ -# Danish translation of trader. -# Copyright (C) 2012 John Zaitseff +# ************************************************************************* +# * * +# * Danish Translations for Star Traders * +# * Copyright (C) 2012-13, John Zaitseff * +# * * +# ************************************************************************* +# # This file is distributed under the same license as the trader package. -# Joe Hansen , 2012. +# +# Contributors: +# Joe Hansen , 2012-13. # msgid "" msgstr "" -"Project-Id-Version: trader 7.4\n" +"Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-05-09 13:57+1000\n" -"PO-Revision-Date: 2012-12-31 00:00+0000\n" +"POT-Creation-Date: 2013-01-18 18:12+1100\n" +"PO-Revision-Date: 2013-02-02 14:26+1100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" -"Language: \n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -111,8 +118,8 @@ msgid "" "playing that game. If GAME is not specified, start a new game.\n" "\n" msgstr "" -"Hvis GAME er angivet som et tal mellem 1 og 9, indlæs og fortsæt\n" -"med at spille. Hvis GAME ikke er angivet, så start et nyt spil.\n" +"Hvis SPIL er angivet som et tal mellem 1 og 9, indlæs og fortsæt\n" +"med at spille. Hvis SPIL ikke er angivet, så start et nyt spil.\n" "\n" #. TRANSLATORS: The first %s is the proper name of the package @@ -862,17 +869,17 @@ msgstr "Kreditbegr.: " #: src/exch.c:366 #, c-format msgid "^{<1>^} Borrow money " -msgstr "^{<1>^} Lån penge " +msgstr "^{<1>^} Lån penge " #: src/exch.c:368 #, c-format msgid "^{<2>^} Repay debt " -msgstr "^{<2>^} Tilbagebetal gæld " +msgstr "^{<2>^} Tilbagebetal gæld" #: src/exch.c:370 #, c-format msgid "^{<3>^} Exit from the Bank" -msgstr "^{<3>^} Forlad banken " +msgstr "^{<3>^} Forlad banken " #: src/exch.c:373 #, c-format @@ -882,7 +889,7 @@ msgstr "Indtast valg [^{1^}-^{3^}]: " #: src/exch.c:426 #, c-format msgid " Insufficient Credit Limit " -msgstr " Kreditten er ikke tilstrækkelig " +msgstr " Kreditten er ikke tilstrækkelig " #: src/exch.c:427 #, c-format @@ -902,7 +909,7 @@ msgstr " Ingen gæld " #: src/exch.c:480 #, c-format msgid "You have no debt to repay." -msgstr "Du har ingen gæld at tilbagebetale" +msgstr "Du har ingen gæld at tilbagebetale." #: src/exch.c:484 #, c-format @@ -937,7 +944,7 @@ msgstr " Aktietransaktion i %ls " #, c-format msgctxt "label|Stock A" msgid "Shares issued: " -msgstr "Udstedte aktier: " +msgstr "Udstedte aktier: " #. TRANSLATORS: "Shares left" is the number of shares that are #. left to be purchased in the current company. @@ -945,7 +952,7 @@ msgstr "Udstedte aktier: " #, c-format msgctxt "label|Stock A" msgid "Shares left: " -msgstr "Tilbagev. aktier " +msgstr "Tilbagev. aktier: " #. TRANSLATORS: "Price per share" is the cost of each share in #. the current company. @@ -953,14 +960,14 @@ msgstr "Tilbagev. aktier " #, c-format msgctxt "label|Stock A" msgid "Price per share: " -msgstr "Pris per aktie: " +msgstr "Pris per aktie: " #. TRANSLATORS: "Return" is the share return as a percentage. #: src/exch.c:613 #, c-format msgctxt "label|Stock A" msgid "Return: " -msgstr "Forrentning: " +msgstr "Forrentning: " #. TRANSLATORS: "Current holdings" is the number of shares the #. current player owns in this particular company. @@ -1093,7 +1100,7 @@ msgstr "" #: src/exch.c:809 #, c-format msgid " Shares Issued " -msgstr " Aktier udstedt " +msgstr " Aktier udstedt " #. TRANSLATORS: %ls represents the company name. #: src/exch.c:811 @@ -1318,20 +1325,20 @@ msgid "" " ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" msgstr "" -"^BStar Traders^N er et simpelt spil med rumhandel. Formålet i spillet er at \n" -"samle den størst mulige mængde af rigdom. Dette gøres ved at oprette \n" -"interstellare handelsruter, udvide dem og købe aktier i firmaerne der \n" -"kontrollerer dem. Aktier stiger i værdi efterhånden som firmaets handel \n" -"udvides. Derudover ændres aktiernes udbytte (som en procent) sig også. \n" -"Spillere kan også låne fra Den Interstellare Handelsbank for at finansiere \n" -"yderligere køb på aktiebørsen.\n" +"^BStar Traders^N er et simpelt spil med rumhandel. Formålet i spillet er at\n" +"samle den størst mulige mængde af rigdom. Dette gøres ved at oprette inter-\n" +"stellare handelsruter, udvide dem og købe aktier i firmaerne der kontrolle-\n" +"rer dem. Aktier stiger i værdi efterhånden som firmaets handel udvides.\n" +"Derudover ændres aktiernes udbytte (som en procent) sig også. Spillere kan\n" +"også låne fra Den Interstellare Handelsbank for at finansiere yderligere køb\n" +"på aktiebørsen.\n" "\n" -"Galaksens kort er repræsenteret ved et ^B~x^N x ^B~y^N-gitter. Et typisk afsnit kan \n" +"Galaksens kort er repræsenteret ved et ^B~x^N x ^B~y^N-gitter. Et typisk afsnit kan\n" "se således ud:\n" "\n" " ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N repræsent. ^Bempty space^N,\n" -" ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N ^s ~* ^N repræsent. ^Bstar^N. \n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N ^s ~* ^N repræsent. ^Bstar^N.\n" " ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" @@ -1353,9 +1360,9 @@ msgid "" "will set up an ^Boutpost^N, not belonging to any company. Thus, if move ^k~3^N is\n" "selected on the above map, a ^o ~+ ^N would be placed at that position.\n" msgstr "" -"Computeren vælger ^B~m^N handlinger (navngivet ^k~1^N til ^k~M^N) vilkårligt, og placerer \n" -"dem på kortet. For at vælge et af de fremhævede placeringer, så tryk på bogstavet.\n" -"For eksempel kan nogle af handlingerne på kortet være:\n" +"Computeren vælger ^B~m^N handlinger (navngivet ^k~1^N til ^k~M^N) vilkårligt, og placerer\n" +"dem på kortet. For at vælge et af de fremhævede placeringer, så tryk på bog-\n" +"stavet. For eksempel kan nogle af handlingerne på kortet være:\n" "\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1365,9 +1372,10 @@ msgstr "" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" "\n" "\n" -"Valg af en position som ^Bikke^N er ved siden af en stjerne (såsom handlingerne ^k~1^N, ^k~3^N \n" -"eller ^k~5^N) vil oprette en ^Bforpost^N, der ikke tilhører noget firma. Hvis handling\n" -"^k~3^N vælges på kortet ovenfor vil en ^o ~+ ^N derfor blive placeret på den placering.\n" +"Valg af en position som ^Bikke^N er ved siden af en stjerne (såsom handlingerne\n" +"^k~1^N, ^k~3^N eller ^k~5^N) vil oprette en ^Bforpost^N, der ikke tilhører noget firma. Hvis\n" +"handling 3 vælges på kortet ovenfor vil en ^o ~+ ^N derfor blive placeret på den\n" +"placering.\n" #: src/help.c:150 msgid "" @@ -1387,14 +1395,15 @@ msgid "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" msgstr "" -"Hvis på den anden side, en placering ved siden af en stjerne (eller en anden forpost)\n" -"er valgt, så vil et ^Bfirma^N blive dannet og dets bogstav vil fremkomme på kortet.\n" -"Som belønning for at oprette firmaet, modtager du de første fem aktier.\n" -"Op til ^B~c^N firmaer kan oprettes på denne måde.\n" +"Hvis på den anden side, en placering ved siden af en stjerne (eller en anden\n" +"forpost) er valgt, så vil et ^Bfirma^N blive dannet og dets bogstav vil frem-\n" +"komme på kortet. Som belønning for at oprette firmaet, modtager du de første\n" +"fem aktier. Op til ^B~c^N firmaer kan oprettes på denne måde.\n" "\n" -"Hvis en placering ved siden af et eksisterende firma vælges vil firmaet udvide sine\n" -"handlinger med et felt. Dette øger prisen for dets aktier og dermed din forrentning\n" -"Hvis kortet var vist som nedenfor vil valg af ^k~6^N eller ^k~8^N øge^N, når du bliver bedt om en handling.\n" -"Individuelle spillere kan også erklære sig selv konkurs på ethvert tidspunkt.\n" -"Hvis din gæld er stor nok risikerer du, at din bank gør det for dig! Hvis du\n" -"ikke gør spillet færdig i din tilgængelige tid, kan du gemme spillet og\n" -"fortsætte senere.\n" +"Her kan du købe aktier, sælge dem, låne fra Handelsbanken eller betale til-\n" +"bage på din gæld (hvis du har gæld). Bemærk at hver firma udsteder et\n" +"begrænset antal aktier — du kan ikke bare købe ind! Du kan dog anmode om, at\n" +"der bliver udstedt flere aktier. Du har en højere sandsynlighed for at få\n" +"succes, hvis du ejer en større andel af firmaet.\n" "\n" "\n" -"^BVinderen af spillet^N er personen med den største samlede nettoformue (samlet\n" -"værdi for kontanter og aktier minus gæld). ^HHeld og lykke^N og må den bedste\n" -"person vinde!\n" +"Spillet slutter normalt efter ^B~t^N runder. Du kan dog afslutte spillet tidli-\n" +"gere ved at trykke på ^K^N, når du bliver bedt om en handling. Indivi-\n" +"duelle spillere kan også erklære sig selv konkurs på ethvert tidspunkt. Hvis\n" +"din gæld er stor nok risikerer du, at din bank gør det for dig! Hvis du ikke\n" +"gør spillet færdig i din tilgængelige tid, kan du gemme spillet og fortsætte\n" +"senere.\n" #: src/help.c:225 msgid "@ Help text, page 7\n" -msgstr "@ Hjælpetekst, side 7\n" +msgstr "" +"^BVinderen af spillet^N er personen med den største samlede nettoformue (samlet\n" +"værdi for kontanter og aktier minus gæld). ^HHeld og lykke^N og må den bedste\n" +"person vinde!\n" #: src/help.c:226 msgid "@ Help text, page 8\n" @@ -1538,7 +1547,7 @@ msgstr " Sådan spiller du " #: src/help.c:286 #, c-format msgid "Page %d of %d" -msgstr "Side %d af %d" +msgstr "Side %d af %d" #. TRANSLATORS: The reason the user is not asked "Press any #. key to continue" is historical: many, many people used to @@ -1557,7 +1566,7 @@ msgstr "[ Tryk for at fortsætte ] " #: src/help.c:494 #, c-format msgid "[ Press to continue or for the previous page ] " -msgstr "[ Tryk for at fortsætte eller for den forrige side ] " +msgstr "[ Tryk for at fortsætte eller for den forrige side ] " #: src/intf.c:110 #, c-format @@ -1663,7 +1672,7 @@ msgstr "xwcrtomb: »%lc«" #: lib/getopt.c:547 lib/getopt.c:576 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: tilvalg »%s« er tvetydigt: muligheder:" +msgstr "%s: tilvalg »%s« er tvetydigt; muligheder:" #: lib/getopt.c:624 lib/getopt.c:628 #, c-format @@ -1698,7 +1707,7 @@ msgstr "%s: ugyldigt tilvalg -- »%c«\n" #: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: tilvalg kræver et argument -- '%c'\n" +msgstr "%s: tilvalg kræver et argument -- »%c«\n" #: lib/getopt.c:934 lib/getopt.c:950 #, c-format From a74f4170c7ffb7c0571201ee59c5b463c9884999 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 21 Feb 2013 19:59:36 +1100 Subject: [PATCH 18/39] Add the Esperanto translation by Felipe Castro Downloaded from the Translation Project, http://translationproject.org/PO-files/eo/trader-7.4.eo.po --- po/eo.po | 1712 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1712 insertions(+) create mode 100644 po/eo.po diff --git a/po/eo.po b/po/eo.po new file mode 100644 index 0000000..64fa441 --- /dev/null +++ b/po/eo.po @@ -0,0 +1,1712 @@ +# Esperanto translation of trader. +# Copyright (C) 2013 Free Software Foundation, Inc. +# This file is distributed under the same license as the trader package. +# Felipe Castro , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: trader 7.4\n" +"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" +"POT-Creation-Date: 2012-05-09 13:57+1000\n" +"PO-Revision-Date: 2013-02-20 15:32-0300\n" +"Last-Translator: Felipe Castro \n" +"Language-Team: Esperanto \n" +"Language: eo\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" + +#: src/trader.c:235 +#, c-format +msgid "%s: invalid value for --max-turn: `%s'\n" +msgstr "%s: malvalida valoro por --max-turn: '%s'\n" + +#: src/trader.c:251 +#, c-format +msgid "%s: invalid operand `%s'\n" +msgstr "%s: malvalida argumento '%s'\n" + +#: src/trader.c:260 +#, c-format +msgid "%s: invalid game number `%s'\n" +msgstr "%s: malvalida lud-numero '%s'\n" + +#: src/trader.c:269 +#, c-format +msgid "%s: extra operand `%s'\n" +msgstr "%s: troa argumento: '%s'\n" + +#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper +#. name of the author. The IPA pronunciation in this comment is in +#. UTF-8 encoding. +#: src/trader.c:284 +#, c-format +msgid "" +"Star Traders (%s) %s\n" +"Copyright (C) %s, John Zaitseff.\n" +"\n" +"Star Traders is a simple game of interstellar trading, where the object\n" +"of the game is to create companies, buy and sell shares, borrow and repay\n" +"money, in order to become the wealthiest player (the winner).\n" +"\n" +"This program is free software that is distributed under the terms of the\n" +"GNU General Public License, version 3 or later. You are welcome to\n" +"modify and/or distribute it under certain conditions. This program has\n" +"NO WARRANTY, to the extent permitted by law; see the License for details.\n" +msgstr "" +"Star Traders (%s) %s\n" +"Kopirajto (C) %s, John Zaitseff.\n" +"\n" +"Star Traders estas simpla ludo pri interstelara komerco, kie la celo\n" +"de la ludo estas krei kompaniojn, aĉeti kaj vendi akciojn, pruntepreni kaj\n" +"repagi monon, por fariĝi la plej riĉa ludanto (la venkanto).\n" +"\n" +"Tiu ĉi programo estas libera programaro, kiu estas disdonata sub la kondiĉoj\n" +"de la GNU-a Ĝenerala Publika Permesilo, versio 3 aŭ posta. Vi estas bonvena\n" +"por modifi kaj/aŭ disdoni ĝin sub kelkaj kondiĉoj. Tiu ĉi programo venas\n" +"kun NENIU GARANTIO, laŭ plejamplekse permesite de la leĝo; konsultu la\n" +"Permesilon por pli da detaloj.\n" + +#: src/trader.c:308 +#, c-format +msgid "%s: Try `%s --help' for more information.\n" +msgstr "%s: Provu '%s --help' por pli da informoj.\n" + +#: src/trader.c:311 +#, c-format +msgid "Usage: %s [OPTION ...] [GAME]\n" +msgstr "Uzmaniero: %s [MODIFILO ...] [LUDO]\n" + +#: src/trader.c:312 +#, c-format +msgid "" +"Play Star Traders, a simple game of interstellar trading.\n" +"\n" +msgstr "" +"Ludi Star Traders, simpla ludo pri interstelara komerco.\n" +"\n" + +#: src/trader.c:315 +#, c-format +msgid "" +"Options:\n" +" -V, --version output version information and exit\n" +" -h, --help display this help and exit\n" +" --no-color don't use color for displaying text\n" +" --max-turn=NUM set the number of turns to NUM\n" +"\n" +msgstr "" +"Modifiloj:\n" +" -V, --version montri informon pri versio kaj eliri\n" +" -h, --help montri tiun ĉi helpon kaj eliri\n" +" --no-color ne uzi kolorojn por montrigi tekston\n" +" --max-turn=NUM difini la nombron da cikloj kiel NUM\n" +"\n" + +#: src/trader.c:322 +#, c-format +msgid "" +"If GAME is specified as a number between 1 and 9, load and continue\n" +"playing that game. If GAME is not specified, start a new game.\n" +"\n" +msgstr "" +"Se LUDO estas indikita kiel numero inter 1 kaj 9, ŝargi kaj daŭrigi\n" +"la ludadon. Se LUDO ne estas indikita, ekigi novan seancon.\n" +"\n" + +#. TRANSLATORS: The first %s is the proper name of the package +#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is +#. the e-mail address for reporting bugs. Please add ANOTHER +#. line with the (translated) text "Report translation bugs to +#.
\n", with ADDRESS replaced with either an e-mail +#. address or web URL for reporting bugs in your translation. +#: src/trader.c:334 +#, c-format +msgid "Report bugs to %s <%s>.\n" +msgstr "" +"Raportu program-misojn al: %s <%s>.\n" +"Raportu traduk-misojn al: .\n" + +#. TRANSLATORS: %s is the e-mail address for reporting bugs. As +#. with the previous string, please add ANOTHER line with the +#. (translated) text "Report translation bugs to
\n", +#. with ADDRESS replaced with either an e-mail address or web URL +#. for reporting bugs in your translation. +#: src/trader.c:341 +#, c-format +msgid "Report bugs to <%s>.\n" +msgstr "" +"Raportu program-misojn al: <%s>.\n" +"Raportu traduk-misojn al: .\n" + +#. TRANSLATORS: The first %s is for packagers and may be +#. something like "Debian". +#: src/trader.c:346 +#, c-format +msgid "Report %s bugs to <%s>.\n" +msgstr "Raportu %s-misojn al <%s>.\n" + +#: src/trader.c:349 +#, c-format +msgid "Star Traders home page: <%s>.\n" +msgstr "Hejmpaĝo de Star Traders: <%s>.\n" + +#. TRANSLATORS: The eight company names do NOT have to be literal +#. translations of the English names. In fact, if possible, the +#. names should start with successive letters of your alphabet (in +#. English, for example, "A" to "H"), and, ideally, be related to +#. constellations or stars in our galaxy. No company name should be +#. more than 24 characters (column positions, to be precise) long. +#: src/globals.c:47 +msgid "Altair Starways" +msgstr "Altairaj Stelvojoj" + +#: src/globals.c:48 +msgid "Betelgeuse, Ltd" +msgstr "Betelĝuza, Klr" + +#: src/globals.c:49 +msgid "Capella Freight Co" +msgstr "Kapela Frajto Ko" + +#: src/globals.c:50 +msgid "Denebola Shippers" +msgstr "Denebolaj Ŝipistoj" + +#: src/globals.c:51 +msgid "Eridani Expediters" +msgstr "Eridanaj Frajtistoj" + +#: src/globals.c:52 +msgid "Fornax Express" +msgstr "Fornakso Ekspresa" + +#: src/globals.c:53 +msgid "Gemeni Inc" +msgstr "Ĝemeloj Enk" + +#: src/globals.c:54 +msgid "Hercules and Co" +msgstr "Herkulo kaj Ko" + +#. TRANSLATORS: This string specifies the keycodes (keyboard input +#. codes) used to enter the Stock Transaction window for each +#. company. There must be exactly eight characters, one for each +#. company in order, before the ASCII vertical line "|"; these must +#. be EITHER all in upper-case or all in lower-case. If at all +#. possible, these should be successive letters in your alphabet (in +#. English, "A" to "H"). Do NOT use digits or control characters. +#. Do not change or translate anything after the vertical line. +#: src/globals.c:68 +msgid "ABCDEFGH|input|Companies" +msgstr "abcdefgh|input|Companies" + +#. TRANSLATORS: This string specifies the keycodes used to select a +#. game move. There must be exactly 20 characters, one for each +#. move, before the ASCII vertical line "|"; these must be EITHER all +#. in upper-case or all in lower-case. If at all possible, these +#. should be successive letters in your alphabet. Do NOT use digits +#. or control characters. Do not change or translate anything after +#. the vertical line. +#: src/globals.c:80 +msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves" +msgstr "abcdefghijklmnoprstu|input|GameMoves" + +#. TRANSLATORS: This string is used to display the galaxy map to +#. screen. There must be exactly 11 characters before the ASCII +#. vertical line. The first ("." in English) is used for empty +#. space, the second ("+") for outposts, the third ("*") for stars, +#. the remaining for the eight companies. Do not change or translate +#. anything after the vertical line. Double-width characters ARE +#. handled correctly. +#: src/globals.c:92 +msgid ".+*ABCDEFGH|output|MapVals" +msgstr ".@*ABCDEFGH|output|MapVals" + +#. TRANSLATORS: This string is used to display the game moves +#. (choices). There must be exactly 20 characters (NUMBER_MOVES) +#. before the ASCII vertical line. The first character corresponds +#. to the first character in the "input|GameMoves" string, and so on. +#. Do not change or translate anything after the vertical line. +#. Double-width characters ARE handled correctly. +#: src/globals.c:103 +msgid "abcdefghijklmnopqrst|output|GameMoves" +msgstr "abcdefghijklmnoprstu|output|GameMoves" + +#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the +#. Game Winner dialog box at the end of the game. If ordinals depend +#. on the gender of the player, it may be simpler to list cardinal +#. numbers instead (eg, "No. 1"). Up to five characters are allowed +#. (see ORDINAL_COLS in src/intf.h). +#: src/globals.c:114 +msgid "1st" +msgstr "1a" + +#: src/globals.c:115 +msgid "2nd" +msgstr "2a" + +#: src/globals.c:116 +msgid "3rd" +msgstr "3a" + +#: src/globals.c:117 +msgid "4th" +msgstr "4a" + +#: src/globals.c:118 +msgid "5th" +msgstr "5a" + +#: src/globals.c:119 +msgid "6th" +msgstr "6a" + +#: src/globals.c:120 +msgid "7th" +msgstr "7a" + +#: src/globals.c:121 +msgid "8th" +msgstr "8a" + +#: src/game.c:117 src/game.c:152 +#, c-format +msgid "Loading game %d... " +msgstr "Ŝargado de la ludo %d..." + +#: src/game.c:226 +#, c-format +msgid " First Player " +msgstr " Unua ludanto " + +#: src/game.c:227 +#, c-format +msgid "The first player to go is ^{%ls^}." +msgstr "La unua ludanto kiu moviĝos estas ^{%ls^}." + +#. TRANSLATORS: The keycode should be modified to +#. match that (or those) specified with msgctxt +#. "input|ContinueGame". +#: src/game.c:259 +#, c-format +msgid "Enter number of players [^{1^}-^{%d^}] or ^{^} to continue a game: " +msgstr "Indiku nombron da ludantoj [^{1^}-^{%d^}] aŭ ^{^} por daŭrigi ludon: " + +#. TRANSLATORS: This string specifies the keycodes used to continue a +#. game; these must NOT contain any numeric digit from 1 to 9. The +#. first character (keyboard input code) is used to print the user's +#. response if one of those keys is pressed. Both upper and +#. lower-case versions should be present. +#: src/game.c:276 +msgctxt "input|ContinueGame" +msgid "Cc" +msgstr "Dd" + +#: src/game.c:341 src/move.c:399 +#, c-format +msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " +msgstr "Indiku lud-numeron [^{1^}-^{9^}] aŭ ^{^} por nuligi: " + +#: src/game.c:406 +#, c-format +msgid "Please enter your name: " +msgstr "Bonvolu indiki vian nomon: " + +#: src/game.c:425 +#, c-format +msgid "Do you need any instructions? [^{Y^}/^{N^}] " +msgstr "Ĉu vi bezonas instrukciojn? [^{J^}/^{N^}] " + +#: src/game.c:443 +#, c-format +msgid " Enter Player Names " +msgstr " Indiku ludant-nomojn " + +#: src/game.c:451 +#, c-format, range: 1..8 +msgid "Player %d: " +msgstr "Ludanto %d: " + +#: src/game.c:529 +#, c-format +msgid "Does any player need instructions? [^{Y^}/^{N^}] " +msgstr "Ĉu iu ludanto bezonas instrukciojn? [^{J^}/^{N^}] " + +#: src/game.c:563 +#, c-format +msgid " Game Over " +msgstr " Ludo-fino " + +#: src/game.c:564 +#, c-format +msgid "The game is over after one turn." +msgid_plural "The game is over after %d turns." +msgstr[0] "La ludo finiĝas post unu ciklo." +msgstr[1] "La ludo finiĝas post %d cikloj." + +#: src/game.c:575 +#, c-format +msgid " Total Value " +msgstr " Totalo " + +#: src/game.c:577 +#, c-format +msgid "Your total value was ^{%N^}." +msgstr "Via totalo estis ^{%N^}." + +#: src/game.c:588 +#, c-format +msgid "" +"The winner is ^{%ls^}\n" +"who is ^[*** BANKRUPT ***^]" +msgstr "" +"La venkanto estas ^{%ls^}\n" +"kiu estas ^[*** BANKROTINTO ***^]" + +#: src/game.c:591 +#, c-format +msgid "" +"The winner is ^{%ls^}\n" +"with a value of ^{%N^}." +msgstr "" +"La venkanto estas ^{%ls^}\n" +"kun totalo ^{%N^}." + +#: src/game.c:597 +#, c-format +msgid " Game Winner " +msgstr " Lud-venkanto " + +#. TRANSLATORS: "Player" is used as a column title in a +#. table containing all player names. +#: src/game.c:606 src/move.c:868 +#, c-format +msgctxt "subtitle" +msgid "Player" +msgstr "Ludanto" + +#. TRANSLATORS: "Total Value" refers to the total worth +#. (shares, cash and debt) of any given player. %ls is the +#. currency symbol of the current locale. +#: src/game.c:611 +#, c-format +msgctxt "subtitle" +msgid "Total Value (%ls)" +msgstr "Totalo (%ls)" + +#: src/game.c:645 src/game.c:695 src/exch.c:100 +#, c-format +msgid "Player: ^{%ls^}" +msgstr "Ludanto: ^{%ls^}" + +#: src/game.c:648 +#, c-format +msgid " Turn: ^{%d^} " +msgstr " Ciklo: ^{%d^} " + +#: src/game.c:649 +#, c-format +msgid " ^[*** Last Turn ***^] " +msgstr " ^[*** Lasta ciklo ***^] " + +#: src/game.c:693 +#, c-format +msgid " Stock Portfolio " +msgstr " Akcio-portalo " + +#. TRANSLATORS: The current player is bankrupt (has no +#. shares or cash, ie, whose total value is zero) +#: src/game.c:702 +#, c-format +msgid "^[* * * B A N K R U P T * * *^]" +msgstr "^[* * * B A N K R O T A * * *^]" + +#: src/game.c:717 src/exch.c:112 +#, c-format +msgid "No companies on the map" +msgstr "Neniu kompanio sur la mapo" + +#. TRANSLATORS: "Company" is a two-line column label in +#. a table containing a list of companies. +#: src/game.c:725 src/exch.c:120 +#, c-format +msgctxt "subtitle" +msgid "" +"\n" +"Company" +msgstr "" +"\n" +"Kompanio" + +#. TRANSLATORS: "Ownership" is a two-line column label +#. in a table containing the current player's +#. percentage ownership in any given company. The +#. maximum column width is 10 characters (see +#. OWNERSHIP_COLS in src/intf.h). +#: src/game.c:732 +#, c-format +msgctxt "subtitle" +msgid "" +"Ownership\n" +"(%%)" +msgstr "" +"Posedo\n" +"(%%)" + +#. TRANSLATORS: "Holdings" is a two-line column label +#. in a table containing the number of shares the +#. current player owns in any given company. The +#. maximum column width is 10 characters (see +#. STOCK_OWNED_COLS in src/intf.h). +#: src/game.c:739 +#, c-format +msgctxt "subtitle" +msgid "" +"Holdings\n" +"(shares)" +msgstr "" +"Havaĵoj\n" +"(akcioj)" + +#. TRANSLATORS: "Return" is a two-line column label in +#. a table containing the share return as a percentage +#. in any given company. The maximum column width is +#. 10 characters (see SHARE_RETURN_COLS in src/intf.h). +#: src/game.c:746 src/exch.c:141 +#, c-format +msgctxt "subtitle" +msgid "" +"Return\n" +"(%%)" +msgstr "" +"Rendimento\n" +"(%%)" + +#. TRANSLATORS: "Price per share" is a two-line column +#. label in a table containing the price per share in +#. any given company. %ls is the currency symbol in +#. the current locale. The maximum column width is 12 +#. characters INCLUDING the currency symbol (see +#. SHARE_PRICE_COLS in src/intf.h). +#: src/game.c:755 src/exch.c:150 +#, c-format +msgctxt "subtitle" +msgid "" +"Price per\n" +"share (%ls)" +msgstr "" +"Prezo por\n" +"akcio (%ls)" + +#. TRANSLATORS: The "Total value", "Current cash", +#. "Current debt" and "Interest rate" labels MUST all be +#. the same length (ie, right-padded with spaces as +#. needed) and must have at least one trailing space so +#. that the display routines work correctly. The maximum +#. length of each label is 36 characters. +#. +#. Note that some of these labels are used for both the +#. Player Status window and the Trading Bank window. +#: src/game.c:796 +#, c-format +msgctxt "label" +msgid "Total value: " +msgstr "Totalo: " + +#: src/game.c:800 src/exch.c:324 +#, c-format +msgctxt "label" +msgid "Current cash: " +msgstr "Nuna mono: " + +#: src/game.c:807 src/exch.c:332 +#, c-format +msgctxt "label" +msgid "Current debt: " +msgstr "Nuna ŝuldo: " + +#: src/game.c:813 src/exch.c:337 +#, c-format +msgctxt "label" +msgid "Interest rate: " +msgstr "Interezo: " + +#. TRANSLATORS: Each label may be up to 37 characters wide +#. (for <1> and <2>) or 38 characters wide (for <3> and +#. ). The sequences "^{" and "^}" change the +#. character rendition (attributes) and take up no space. +#: src/move.c:243 src/exch.c:182 +#, c-format +msgid "^{<1>^} Display stock portfolio" +msgstr "^{<1>^} Montri la akci-portalon" + +#: src/move.c:245 +#, c-format +msgid "^{<2>^} Declare bankruptcy" +msgstr "^{<2>^} Deklari bankroton" + +#: src/move.c:247 +#, c-format +msgid "^{<3>^} Save and end the game" +msgstr "^{<3>^} Konservi kaj eliri" + +#: src/move.c:249 +#, c-format +msgid "^{^} Quit the game" +msgstr "^{^} Eliri la ludon" + +#. TRANSLATORS: The maximum column width is 38 characters, +#. including the trailing space. The sequences "^{", "^}", +#. "^[" and "^]" do not take up any room. "%lc" takes up +#. either one or two columns, depending on the appropriate +#. "output|GameMoves" string in the current PO file. +#: src/move.c:258 +#, c-format +msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " +msgstr "Elektu movon [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " + +#. TRANSLATORS: A game usually consists of +#. DEFAULT_MAX_TURN (50) turns. On each +#. turn, the computer randomly selects +#. NUMBER_MOVES (20) moves (positions on the +#. map); each player selects just one move +#. per turn. "Move" refers to the player's +#. choice. +#: src/move.c:295 +#, c-format +msgid "Move ^{%lc^}" +msgstr "Movo ^{%lc^}" + +#: src/move.c:316 +#, c-format +msgid "^{<2>^} (Declare bankruptcy)" +msgstr "^{<2>^} (Deklari bankroton)" + +#: src/move.c:325 +#, c-format +msgid "^{<3>^} (Save and end the game)" +msgstr "^{<3>^} (Konservi kaj eliri)" + +#: src/move.c:346 +#, c-format +msgid "^{^} (Quit the game)" +msgstr "^{^} (Eliri la ludon)" + +#: src/move.c:361 +#, c-format +msgid "Are you sure? [^{Y^}/^{N^}] " +msgstr "Ĉu vi certas? [^{J^}/^{N^}] " + +#: src/move.c:378 src/move.c:456 +#, c-format +msgid "Saving game %d... " +msgstr "Konservado de la ludo %d... " + +#: src/move.c:686 src/move.c:694 src/move.c:1052 src/move.c:1089 +#, c-format +msgid " Bankruptcy Court " +msgstr " Bankrota kortumo " + +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:688 +#, c-format +msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." +msgstr "%ls estis deklarata de la Interstelara Komerca Banko kiel bankrota." + +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:696 +#, c-format +msgid "%ls has declared bankruptcy." +msgstr "%ls deklaris bankroton." + +#: src/move.c:764 +#, c-format +msgid " New Company " +msgstr " Nova kompanio " + +#: src/move.c:765 +#, c-format +msgid "" +"A new company has been formed!\n" +"Its name is ^{%ls^}." +msgstr "" +"Nova kompanio naskiĝis!\n" +"Ĝi nomiĝas ^{%ls^}." + +#: src/move.c:824 +#, c-format +msgid "" +"^{%ls^} has just merged into ^{%ls^}.\n" +"Please note the following transactions:\n" +msgstr "" +"^{%ls^} ĵus kunfandiĝis al ^{%ls^}.\n" +"Bonvolu rimarki la jenajn transakciojn:\n" + +#: src/move.c:830 +#, c-format +msgid " Company Merger " +msgstr " Kompani-kunfandisto " + +#. TRANSLATORS: "Old stock" refers to the company that has +#. just ceased existence due to a merger. +#. +#. Note that the "Old stock" and "New stock" labels MUST be +#. the same length and must contain a trailing space for the +#. display routines to work correctly. The maximum length of +#. each label is 36 characters. +#: src/move.c:850 +#, c-format +msgctxt "label" +msgid "Old stock: " +msgstr "Malnova akcio: " + +#. TRANSLATORS: "New stock" refers to the company that has +#. absorbed the other due to a merger. +#: src/move.c:861 +#, c-format +msgctxt "label" +msgid "New Stock: " +msgstr "Nova akcio: " + +#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to +#. each player after two companies merge. %ls is the currency +#. symbol in the current locale. The maximum column width is +#. 12 characters INCLUDING the currency symbol (see +#. MERGE_BONUS_COLS in src/intf.h). +#: src/move.c:875 +#, c-format +msgctxt "subtitle" +msgid "Bonus (%ls)" +msgstr "Premio (%ls)" + +#. TRANSLATORS: "Total" refers to the total number of shares in +#. the new company after a merger. The maximum column width is +#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). +#: src/move.c:880 +#, c-format +msgctxt "subtitle" +msgid "Total" +msgstr "Totalo" + +#. TRANSLATORS: "New" refers to how many (new) shares each +#. player receives in the surviving company after a merger. +#. The maximum column width is 8 characters (see +#. MERGE_NEW_STOCK_COLS in src/intf.h). +#: src/move.c:887 +#, c-format +msgctxt "subtitle" +msgid "New" +msgstr "Nova" + +#. TRANSLATORS: "Old" refers to how many shares each player had +#. in the company ceasing existence. The maximum column width +#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). +#: src/move.c:893 +#, c-format +msgctxt "subtitle" +msgid "Old" +msgstr "Malnova" + +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1054 +#, c-format +msgid "" +"%ls has been declared bankrupt by the Interstellar Trading Bank.\n" +"\n" +"^{All assets have been taken to repay outstanding loans.^}" +msgstr "" +"%ls estis deklarata de la Interstelara Komerca Banko kiel bankrota.\n" +"\n" +"^{Ĉiuj havaĵoj estis prenataj por repagi gravajn pruntojn.^}" + +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1078 +#, c-format +msgid "" +"%ls has been declared bankrupt by the Interstellar Trading Bank.\n" +"\n" +"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}" +msgstr "" +"%ls estis deklarata de la Interstelara Komerca Banko kiel bankrota.\n" +"\n" +"^{La banko konsentis pagi al akci-tenantoj ^}%.2f%%^{ el la akci-valoro de ĉiu posedita akcio.^}" + +#. TRANSLATORS: The label "Amount paid per share" +#. refers to payment made by the Interstellar +#. Trading Bank to each player upon company +#. bankruptcy. This label MUST be the same +#. length as "Old share value" and MUST have at +#. least one trailing space for the display +#. routines to work correctly. The maximum +#. length is 28 characters. +#: src/move.c:1106 +#, c-format +msgctxt "label" +msgid "Amount paid per share: " +msgstr "Kvanto pagita por akcio: " + +#. TRANSLATORS: "Old share value" refers to the +#. share price of a company before it was forced +#. into bankruptcy by the Bank. This label must be +#. the same width as "Amount paid per share". +#: src/move.c:1114 +#, c-format +msgctxt "label" +msgid "Old share value: " +msgstr "Malnova akci-valoro: " + +#: src/move.c:1197 src/move.c:1232 src/exch.c:321 +#, c-format +msgid " Interstellar Trading Bank " +msgstr " Interstelara Komerca Banko " + +#: src/move.c:1199 +#, c-format +msgid "" +"You were forced to borrow %N\n" +"to cover losses from company shares." +msgstr "" +"Vi estis devigata pruntepreni %N\n" +"por kovri perdojn el kompani-akcioj." + +#: src/move.c:1234 +#, c-format +msgid "" +"Your debt has amounted to %N!\n" +"^{The Bank has impounded ^}%N^{ from your cash.^}" +msgstr "" +"Via ŝuldo amasiĝis al %N!\n" +"^{La banko rezerv-prenis ^}%N^{ el via mono.^}" + +#: src/exch.c:98 +#, c-format +msgid " Interstellar Stock Exchange " +msgstr " Interstelara akci-interŝanĝejo " + +#. TRANSLATORS: "Shares left" is a two-line column +#. label in a table containing the number of shares +#. left to be purchased in any given company. The +#. maximum column width is 10 characters (see +#. STOCK_LEFT_COLS in src/intf.h). +#: src/exch.c:127 +#, c-format +msgctxt "subtitle" +msgid "" +"Shares\n" +"left" +msgstr "" +"Akcioj\n" +"lasitaj" + +#. TRANSLATORS: "Shares issued" is a two-line column +#. label in a table containing the number of shares +#. already sold (ie, bought by all players) in any +#. given company. The maximum column width is 10 +#. characters (see STOCK_ISSUED_COLS in src/intf.h). +#: src/exch.c:134 +#, c-format +msgctxt "subtitle" +msgid "" +"Shares\n" +"issued" +msgstr "" +"Akcioj\n" +"venditaj" + +#. TRANSLATORS: Each label may be up to 37 characters wide +#. (for <1> and <2>) or 38 characters wide (for <3> and <4>). +#: src/exch.c:186 +#, c-format +msgid "^{<2>^} Display galaxy map" +msgstr "^{<2>^} Montri galaksi-mapon" + +#: src/exch.c:188 +#, c-format +msgid "^{<3>^} Visit the Trading Bank" +msgstr "^{<3>^} Viziti la Komercan Bankon" + +#: src/exch.c:190 +#, c-format +msgid "^{<4>^} Exit the Stock Exchange" +msgstr "^{<4>^} Eliri la akci-interŝanĝejon" + +#: src/exch.c:193 +#, c-format +msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " +msgstr "Indiku elekton [^[Kompani-litero^]/^{1^}-^{4^}]: " + +#. TRANSLATORS: The "Total value", "Current cash", "Current +#. debt", "Interest rate" and "Credit limit" labels MUST all be +#. the same length (ie, right-padded with spaces as needed) and +#. must have at least one trailing space so that the display +#. routines work correctly. The maximum length of each label +#. is 36 characters. +#. +#. Note that some of these labels are used for both the Player +#. Status window and the Trading Bank window. +#: src/exch.c:351 +#, c-format +msgctxt "label" +msgid "Credit limit: " +msgstr "Kredit-limo: " + +#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit +#. from the Bank" menu options must all be the same length +#. (ie, padded with trailing spaces as required). The maximum +#. length is 72 characters. +#: src/exch.c:366 +#, c-format +msgid "^{<1>^} Borrow money " +msgstr "^{<1>^} Pruntepreni monon" + +#: src/exch.c:368 +#, c-format +msgid "^{<2>^} Repay debt " +msgstr "^{<2>^} Repagi ŝuldon " + +#: src/exch.c:370 +#, c-format +msgid "^{<3>^} Exit from the Bank" +msgstr "^{<3>^} Eliri la bankon " + +#: src/exch.c:373 +#, c-format +msgid "Enter selection [^{1^}-^{3^}]: " +msgstr "Indiku elekton [^{1^}-^{3^}]: " + +#: src/exch.c:426 +#, c-format +msgid " Insufficient Credit Limit " +msgstr " Nesufiĉa kredit-limo " + +#: src/exch.c:427 +#, c-format +msgid "The Bank will not lend you any more money." +msgstr "La banko ne pruntedonos al vi pli da mono." + +#: src/exch.c:447 +#, c-format +msgid "How much do you wish to borrow? " +msgstr "Kiom vi deziras pruntepreni? " + +#: src/exch.c:479 +#, c-format +msgid " No Debt " +msgstr " Sen ŝuldo " + +#: src/exch.c:480 +#, c-format +msgid "You have no debt to repay." +msgstr "Vi havas neniom da ŝuldo por repagi." + +#: src/exch.c:484 +#, c-format +msgid " No Cash " +msgstr " Sen mono " + +#: src/exch.c:485 +#, c-format +msgid "You have no cash with which to repay the debt!" +msgstr "Vi havan neniom da mono por repagi la ŝuldon!" + +#: src/exch.c:505 +#, c-format +msgid "How much do you wish to repay? " +msgstr "Kiom vi deziras repagi? " + +#. TRANSLATORS: %ls represents the company name. +#: src/exch.c:581 +#, c-format +msgid " Stock Transaction in %ls " +msgstr " Akcia transakcio en %ls " + +#. TRANSLATORS: "Shares issued" represents the number of +#. shares already sold by the company to all players. +#. +#. Note that the labels "Shares issued", "Shares left", +#. "Price per share" and "Return" must all be the same length +#. and must have at least one trailing space for the output +#. routines to work correctly. The maximum length of each +#. label is 22 characters. +#: src/exch.c:592 +#, c-format +msgctxt "label|Stock A" +msgid "Shares issued: " +msgstr "Akcioj venditaj: " + +#. TRANSLATORS: "Shares left" is the number of shares that are +#. left to be purchased in the current company. +#: src/exch.c:600 +#, c-format +msgctxt "label|Stock A" +msgid "Shares left: " +msgstr "Akcioj lasitaj: " + +#. TRANSLATORS: "Price per share" is the cost of each share in +#. the current company. +#: src/exch.c:607 +#, c-format +msgctxt "label|Stock A" +msgid "Price per share: " +msgstr "Prezo por akcio: " + +#. TRANSLATORS: "Return" is the share return as a percentage. +#: src/exch.c:613 +#, c-format +msgctxt "label|Stock A" +msgid "Return: " +msgstr "Rendimento: " + +#. TRANSLATORS: "Current holdings" is the number of shares the +#. current player owns in this particular company. +#. +#. Note that the labels "Current holdings", "Percentage owned" +#. and "Current cash" MUST all be the same length and contain at +#. least one trailing space for the display routines to work +#. correctly. The maximum length of each label is 18 +#. characters. +#: src/exch.c:626 +#, c-format +msgctxt "label|Stock B" +msgid "Current holdings: " +msgstr "Nunaj havaĵoj: " + +#. TRANSLATORS: "Percentage owned" is the current player's +#. percentage ownership in this particular company. +#: src/exch.c:633 +#, c-format +msgctxt "label|Stock B" +msgid "Percentage owned: " +msgstr "Elcento posedita: " + +#: src/exch.c:638 +#, c-format +msgctxt "label|Stock B" +msgid "Current cash: " +msgstr "Nuna mono: " + +#. TRANSLATORS: Each label may be up to 35 characters wide +#. (for <1> and <2>) or 36 characters wide (for <3> and <4>). +#: src/exch.c:651 +#, c-format +msgid "^{<1>^} Buy stock from company" +msgstr "^{<1>^} Aĉeti akcion el kompanio" + +#: src/exch.c:653 +#, c-format +msgid "^{<2>^} Sell stock back to company" +msgstr "^{<2>^} Vendi akcion returne al kompanio" + +#: src/exch.c:655 +#, c-format +msgid "^{<3>^} Bid company to issue more shares" +msgstr "^{<3>^} Peti kompanion vendi pli akciojn" + +#: src/exch.c:657 +#, c-format +msgid "^{<4>^} Exit to the Stock Exchange" +msgstr "^{<4>^} Eliri la akci-interŝanĝejon" + +#: src/exch.c:660 +#, c-format +msgid "Enter selection [^{1^}-^{4^}]: " +msgstr "Indiku elekton [^{1^}-^{4^}]: " + +#: src/exch.c:716 +#, c-format +msgid " No Shares Available " +msgstr " Neniu akcio disponeblas " + +#: src/exch.c:717 +#, c-format +msgid "No more shares are available for purchase." +msgstr "Neniu plia akcio disponeblas por aĉeto." + +#: src/exch.c:721 +#, c-format +msgid " Insufficient Cash " +msgstr " Nesufiĉe da mono " + +#: src/exch.c:722 +#, c-format +msgid "" +"You do not have enough cash\n" +"to purchase additional shares." +msgstr "" +"Vi ne havas sufiĉe da mono\n" +"por aĉeti aldonajn akciojn." + +#: src/exch.c:733 +#, c-format +msgid "You can purchase ^{one^} share." +msgid_plural "You can purchase up to ^{%'ld^} shares." +msgstr[0] "Vi povas aĉeti ^{unu^} akcion." +msgstr[1] "Vi povas aĉeti ĝis ^{%'ld^} akciojn." + +#: src/exch.c:739 +#, c-format +msgid "How many shares do you wish to purchase? " +msgstr "Kiom da akcioj vi deziras aĉeti?" + +#: src/exch.c:760 +#, c-format +msgid " No Shares " +msgstr " Neniu akcio " + +#: src/exch.c:761 +#, c-format +msgid "You do not have any shares to sell." +msgstr "Vi havas neniun akcio por vendi." + +#: src/exch.c:768 +#, c-format +msgid "You can sell ^{one^} share." +msgid_plural "You can sell up to ^{%'ld^} shares." +msgstr[0] "Vi povas vendi ^{unu^} akcion." +msgstr[1] "Vi povas vendi ĝis ^{%'ld^} akciojn." + +#: src/exch.c:774 +#, c-format +msgid "How many shares do you wish to sell? " +msgstr "Kiom da akcioj vi deziras vendi?" + +#: src/exch.c:802 +#, c-format +msgid " No Shares Issued " +msgstr " Neniu akcio vendita " + +#. TRANSLATORS: %ls represents the company name. +#: src/exch.c:804 +#, c-format +msgid "" +"%ls has refused\n" +"to issue more shares." +msgstr "" +"%ls rifuzis\n" +"disponigi pli da akcioj." + +#: src/exch.c:809 +#, c-format +msgid " Shares Issued " +msgstr " Akcioj venditaj " + +#. TRANSLATORS: %ls represents the company name. +#: src/exch.c:811 +#, c-format +msgid "" +"%ls has issued\n" +"^{one^} more share." +msgid_plural "" +"%ls has issued\n" +"^{%'ld^} more shares." +msgstr[0] "" +"%ls disponigis\n" +"^{unu^} plian akcion." +msgstr[1] "" +"%ls disponigis\n" +"^{%'ld^} pliajn akciojn." + +#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#, c-format +msgid "%s: missing field on line %d" +msgstr "%s: mankas kampon en linio %d" + +#: src/fileio.c:60 +#, c-format +msgid "%s: illegal field on line %d: `%s'" +msgstr "%s: malpermesata kampo en linio %d: '%s'" + +#: src/fileio.c:64 +#, c-format +msgid "%s: illegal value on line %d: `%s'" +msgstr "%s: malpermesata valoro en linio %d: '%s'" + +#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 +#, c-format +msgid "%s: illegal value on line %d" +msgstr "%s: malpermesata valoro en linio %d" + +#: src/fileio.c:103 +#, c-format +msgid "%s: illegal characters on line %d" +msgstr "%s: malpermesataj signoj en linio %d" + +#: src/fileio.c:184 +#, c-format +msgid "%s: could not convert string" +msgstr "%s: ne eblis konverti ĉenon" + +#: src/fileio.c:255 +#, c-format +msgid " Game Not Found " +msgstr " Seanco ne trovita " + +#: src/fileio.c:256 +#, c-format +msgid "Game %d has not been saved to disk." +msgstr "La seanco %d ne estas konservita en la disko." + +#: src/fileio.c:263 +#, c-format +msgid " Game Not Loaded " +msgstr " Seanco ne ŝargita " + +#: src/fileio.c:264 +#, c-format +msgid "" +"Game %d could not be loaded from disk.\n" +"\n" +"^{File %s: %s^}" +msgstr "" +"La seanco %d ne povis esti ŝargata el la disko.\n" +"\n" +"^{Dosiero %s: %s^}" + +#: src/fileio.c:316 +#, c-format +msgid "%s: missing header in game file" +msgstr "%s: mankas kaplinio en lud-dosiero" + +#: src/fileio.c:319 +#, c-format +msgid "%s: not a valid game file" +msgstr "%s: ne estas valida lud-dosiero" + +#: src/fileio.c:322 src/fileio.c:329 +#, c-format +msgid "%s: missing subheader in game file" +msgstr "%s: mankas subkaplinio en lud-dosiero" + +#: src/fileio.c:325 +#, c-format +msgid "%s: saved under a different version of Star Traders" +msgstr "%s: konservita sub malsama versio de Star Traders" + +#: src/fileio.c:332 +#, c-format +msgid "%s: saved under an incompatible character encoding" +msgstr "%s: konservita sub nekongrua signa enkodigo" + +#: src/fileio.c:340 +#, c-format +msgid "%s: illegal or missing field on line %d" +msgstr "%s: malpermesata aŭ mankanta kampo en linio %d" + +#: src/fileio.c:384 +#, c-format +msgid "%s: illegal field on line %d" +msgstr "%s: malpermesata kampo en linio %d" + +#: src/fileio.c:466 src/fileio.c:487 +#, c-format +msgid " Game Not Saved " +msgstr " Seanco ne konservita " + +#: src/fileio.c:467 +#, c-format +msgid "" +"Game %d could not be saved to disk.\n" +"\n" +"^{Directory %s: %s^}" +msgstr "" +"La seanco %d ne povis esti konservata en la disko.\n" +"\n" +"^{Dosierujo %s: %s^}" + +#: src/fileio.c:488 +#, c-format +msgid "" +"Game %d could not be saved to disk.\n" +"\n" +"^{File %s: %s^}" +msgstr "" +"La seanco %d ne povis esti konservata en la disko.\n" +"\n" +"^{Dosiero %s: %s^}" + +#. TRANSLATORS: The help text for Star Traders is marked up using a +#. custom mark-up format NOT used anywhere else in the source code. +#. +#. Each string is a single page of text that is displayed in an area 76 +#. columns wide by 16 lines high. Each line is delimited by "\n". NO +#. word-wrapping is performed: you must place the "\n" characters in the +#. appropriate place. Ideally, each line within the string should be +#. also (manually) space-justified or centred. TAB characters and other +#. control codes must NOT be used. If a string starts with "@" as the +#. very first character, that string is ignored (as are all strings +#. following): this allows a variable number of help text pages (from +#. one to ten). Multibyte strings are handled correctly (even those +#. requiring shift sequences!). +#. +#. The ASCII circumflex accent character "^" switches to a different +#. character rendition (also called attributes), depending on the +#. character following the "^": +#. +#. ^^ - Print the circumflex accent (ASCII code U+005E) +#. ^N - Switch to using the normal character rendition +#. ^B - Switch to using the bold character rendition +#. ^H - Switch to using the highlight character rendition +#. ^K - Switch to using the keycode character rendition (such as used for "") +#. ^e - Switch to using the character rendition used for empty space +#. ^o - Switch to using the character rendition used for outposts +#. ^s - Switch to using the character rendition used for stars +#. ^c - Switch to using the character rendition used for companies +#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map +#. +#. The help text parsing routines also understand the following "value +#. escapes" introduced by the ASCII tilde character "~"; these act like +#. "%" conversion specifiers in printf(): +#. +#. ~~ - Print the tilde character (ASCII code U+007E) [*] +#. ~x - Print the width of the galaxy map (MAX_X) [**] +#. ~y - Print the height of the galaxy map (MAX_Y) [**] +#. ~m - Print the number of moves available (NUMBER_MOVES) [**] +#. ~c - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*] +#. ~t - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**] +#. ~1 to ~9 - Print the keycode for the N-th choice of move [***] +#. ~M - Print the keycode for the last choice of move [***] +#. ~A to ~H - Print the character used to represent the company on the galaxy map [***] +#. ~. - Print the character used to represent empty space on the map [***] +#. ~+ - Print the character used to represent outposts on the map [***] +#. ~* - Print the character used to represent stars on the map [***] +#. +#. [*] Takes one character space (column space) in the output +#. [**] Takes two column spaces in the output +#. [***] Takes one or two column spaces in the output, depending on the +#. appropriate strings in the current PO file. +#. +#. Note that all keycodes and map representation characters use locale- +#. specific characters; double-width characters ARE supported. Note +#. also that the tilde value escapes do NOT change the current character +#. rendition: a circumflex accent escape is needed for that. For +#. example, to display the first choice of move as it would be shown on +#. the galaxy map, use something like "^k~1^N" (a six-character sequence +#. that would translate to just one character (or maybe two) in the +#. output text). +#. +#. Formatting the help text is probably the most complicated and tedious +#. part of translating Star Traders. The author and maintainer of this +#. game is more than happy to help you with this task: if you are able +#. to provide a translation, even if it is not formatted correctly, the +#. maintainer will perform the necessary adjustments for word-wrapping +#. and justification. In addition, remember that you have up to 10 +#. pages in which to display your help text: the translation does not +#. need to correspond exactly to the original text. This text will not +#. be changing any time soon! +#. +#: src/help.c:113 +msgid "" +"^BStar Traders^N is a simple game of interstellar trading. The object of the\n" +"game is to amass the greatest amount of wealth possible. This is done by\n" +"creating interstellar shipping lanes, expanding them and buying shares in\n" +"the companies controlling them. Shares appreciate in value as company\n" +"operations expand. In addition, the return on each share (as a percentage)\n" +"also changes. Players may also borrow from the Interstellar Trading Bank to\n" +"finance additional purchases on the Stock Exchange.\n" +"\n" +"The map of the galaxy is represented by a ^B~x^N x ^B~y^N grid. A typical section\n" +"of it may be:\n" +"\n" +" ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N represents ^Bempty space^N,\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N ^s ~* ^N represents a ^Bstar^N.\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" +msgstr "" +"^BStar Traders^N estas simpla ludo pri interstelara komerco. Ĝia celo estas\n" +"amasigi la plej grandan kvanton da riĉeco ebla. Tion oni atingas per kreado\n" +"de interstelaraj ŝipaj vojoj, pligrandigante ilin kaj aĉetante akciojn en la\n" +"kompanioj kiuj regas ilin. Akcioj plivaloriĝas laŭ la progreso de la\n" +"operacioj de la kompanio. Cetere, la rendimento de ĉiu akcio (procente)\n" +"ankaŭ ŝanĝas. Ludantoj povas ankaŭ pruntepreni el la Interstelara Komerca\n" +"Banko por financi aldonajn aĉetojn en la akci-interŝanĝejo.\n" +"\n" +"La galaksi-mapo estas reprezentata per krado ^B~x^N x ^B~y^N. Ordinara areo de ĝi\n" +"povas esti:\n" +"\n" +" ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N reprezentas ^Bvakan spacon^N,\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N ^s ~* ^N reprezentas ^Bstelon^N.\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" + +#: src/help.c:132 +msgid "" +"The computer selects ^B~m^N moves (labeled ^k~1^N to ^k~M^N) at random, and places these\n" +"on the map. To select any of the highlighted positions, press that letter.\n" +"For example, some of the moves on the map may be:\n" +"\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N Moves ^k~1^N to ^k~5^N shown.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" +"\n" +"\n" +"Selecting a position that is ^Bnot^N next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n" +"will set up an ^Boutpost^N, not belonging to any company. Thus, if move ^k~3^N is\n" +"selected on the above map, a ^o ~+ ^N would be placed at that position.\n" +msgstr "" +"La komputilo elektas hazarde ^B~m^N movojn (etikeditaj per ^k~1^N al ^k~M^N), kaj metas\n" +"ilin sur la mapo. Por elekti iun el la reliefigitaj pozicioj, premu tiun\n" +"literon. Ekzemple, kelkaj el la movoj sur la mapo povas esti:\n" +"\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N Movoj de ^k~1^N al ^k~5^N estas montrataj.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" +"\n" +"\n" +"Elekti pozicion kiu ^Bne^N estas proksime de stelo (kiel la movoj ^k~1^N, ^k~3^N aŭ ^k~5^N)\n" +"rezultas en difino de ^Bpikedo^N, ne apartenanta al iu ajn kompanio. Do, se la\n" +"movo ^k~3^N estus elektata en la supra mapo, ^o ~+ ^N estus metota ĉe tiu pozicio.\n" + +#: src/help.c:150 +msgid "" +"If, on the other hand, a position next to a star (or another outpost) is\n" +"selected, a ^Bcompany^N would be formed and its letter would appear on the map.\n" +"As a reward for creating the company, you are granted the first five shares.\n" +"Up to ^B~c^N companies can be created in this way.\n" +"\n" +"If a position next to an existing company is selected, the company would\n" +"expand its operations by one square. This increases the cost of its shares\n" +"and hence your return. Thus, if the map was as shown below, selecting ^k~6^N\n" +"or ^k~8^N increases Company ^B~B^N's shipping lane:\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" +msgstr "" +"Alimaniere, se pozicio proksime de stelo aŭ de alia pikedo estus elektata,\n" +"^Bkompanio^N estus kreota kaj ĝia litero estus aperonta en la mapo. Kiel\n" +"premio por kreo de kompanio, vi ricevas la unuajn kvin akciojn.\n" +"Ĝis ^B~c^N kompanioj povas esti tiel kreataj.\n" +"\n" +"Se pozicio proksime de kompanio estus elektata, la kompanio pliampleksigus\n" +"ĝiajn operaciojn je unu kvadrato. Tio pliigus la koston de ĝiaj akcioj kaj\n" +"tiel ankaŭ la rendimento pliiĝus. Do, se la mapo estus kiel montrate sube,\n" +"elekto de ^k~6^N aŭ ^k~8^N pligrandigas la ŝip-vojon de la Kompanio ^B~B^N:\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Movoj ^k~6^N aŭ ^k~8^N pligrandigas Kompanion ^B~B^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" + +#: src/help.c:168 +msgid "" +"Selecting positions next to stars increases the value of your stock by about\n" +"five times as much as an extension not next to a star. Thus move ^k~6^N should\n" +"be preferred to move ^k~8^N.\n" +"\n" +" ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Move ^k~6^N is preferred to ^k~8^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" +"\n" +"You may also expand any company by selecting positions next to outposts.\n" +"Such outposts will be swallowed up by that company. Thus, move ^k~1^N will\n" +"extend Company ^B~C^N by ^Btwo^N squares. As a bonus, outposts next to stars are\n" +"more valuable: the company's share price will increase by a greater amount\n" +"than it would for outposts not next to stars.\n" +msgstr "" +"Elekto de pozicio proksime de steloj plivalorigas viajn akciojn proksimume\n" +"kvinoble ol pozicio ne proksime de stelo. Do la movo ^k~6^N devus esti\n" +"preferata ol la movo ^k~8^N.\n" +"\n" +" ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Movo ^k~6^N estas preferata ol ^k~8^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" +"\n" +"Vi povas ankaŭ pligrandigi iun ajn kompanion elektante poziciojn proksimajn\n" +"de pikedoj. Tiaj pikedoj estos englutitaj de tiu kompanio. Do, la movo ^k~1^N\n" +"pligrandigos la Kompanion ^B~C^N per ^Bdu^N kvadratoj. Kiel premio, pikedoj proksimaj\n" +"al steloj estas pli valoraj: la akci-prezo de la kompanio altiĝas pli ol se\n" +"la pikedo ne estas proksima de steloj.\n" + +#: src/help.c:186 +msgid "" +"If two companies are separated on the map by only one square, then they can\n" +"be ^Bmerged^N into one company by selecting that position (if available). For\n" +"example, on the map below, companies ^B~A^N and ^B~B^N can be merged by selecting ^k~5^N.\n" +"When this occurs, the company with the greater assets value takes over the\n" +"other one. Here, Company ^B~B^N might take over Company ^B~A^N. Company ^B~A^N ceases to\n" +"exist, although it may reappear as an entirely new company at a later stage.\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n" +" ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n" +"\n" +"When companies merge, players are granted shares in the dominant company\n" +"proportional to the amount owned in the old company. As well, a cash bonus\n" +"is also paid, proportional to the percentage of the old company owned.\n" +msgstr "" +"Se du kompanioj estas apartitaj en la mapo per nur unu kvadrato, tiam ili\n" +"povas esti ^Bkunfanditaj^N en unu kompanio per elekto de tiu pozicio (nur se\n" +"disponebla). Ekzemple, en la suba mapo, kompanioj ^B~A^N kaj ^B~B^N povas kunfandiĝi\n" +"per elekto de ^k~5^N. Kiam tio okazas, la kompanio kun pli da havaĵoj akiras la\n" +"alian. Ĉi tie, la kompanio ^B~B^N povus akiri la kompanion ^B~A^N. Kompanio ^B~A^N ĉesas\n" +"ekzisti, kvankam ĝi povos reaperi kiel entute nova kompanio pli poste.\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N Movo ^k~5^N kunfandigas kompaniojn ^B~A^N kaj ^B~B^N.\n" +" ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n" +"\n" +"Kiam kompanioj kunfandiĝas, la ludantoj ricevas akciojn de la mastrumanta\n" +"kompanio proporcie al la kvanto posedita en la malnova kompanio. Kaj premio\n" +"estas ankaŭ pagita, proporcie al la procenta posedo de la malnova kompanio.\n" + +#: src/help.c:205 +msgid "" +"Once you select your move, you enter the ^BInterstellar Stock Exchange^N. Here\n" +"you may purchase shares, sell them, borrow from the Trading Bank or repay\n" +"some of your debt (if applicable). Note that each company issues a limited\n" +"number of shares -- you cannot go on buying for ever! You may, however, bid\n" +"for more shares to be issued. You have a better chance of succeeding if you\n" +"own a larger proportion of the company.\n" +"\n" +"The game usually ends after ^B~t^N turns. However, you may end the game sooner\n" +"by pressing ^K^N when asked to select a move. As well, individual\n" +"players can declare themselves bankrupt at any time. If your debt is large\n" +"enough, the Bank may do this for you! If you do not complete your game in\n" +"the time you have available, you may save the game and continue it later.\n" +"\n" +"\n" +"The ^Bwinner of the game^N is the person with the greatest net worth (total\n" +"value of cash, stock and debt). ^HGood luck^N and may the best person win!\n" +msgstr "" +"Tuj post kiam vi elektas vian movon, vi eniras la ^BInterstelaran akcian inter-\n" +"ŝanĝejon^N. Tie vi povas aĉeti akciojn, vendi ilin, pruntepreni el la Komerca\n" +"Banko aŭ repagi iom el via ŝuldo (se ekzistanta). Rimarku ke ĉiu kompanio\n" +"disponigas limigitan nombron da akcioj -- vi ne povas aĉeti senfine! Tamen,\n" +"vi povas peti ke pli da akcioj estu vendataj. Vi pli ŝancas sukcesi se vi\n" +"posedas pli grandan proporcion de la kompanio.\n" +"\n" +"La ludo ordinare finas post ^B~t^N cikloj. Tamen, vi povas fini la ludon pli\n" +"frue premante ^K^N kiam aldemandita elekti movon. Krome, individuaj\n" +"ludantoj povas sin deklari bankrotaj iam ajn. Se via ŝuldo estas sufiĉe\n" +"granda, la Banko povas fari tion por vi! Se vi ne plenumas la ludon en la\n" +"tempo kiun vi disponas, vi povas konservi ĝin kaj daŭrigi poste.\n" +"\n" +"\n" +"La ^Bvenkanto de la ludo^N estas tiu kun la plej granda totalo (entuta valoro\n" +"de mono, akcioj kaj ŝuldo). ^HBonan ŝancon^N kaj ke la plej lerta venku!\n" + +#: src/help.c:225 +msgid "@ Help text, page 7\n" +msgstr "@\n" + +#: src/help.c:226 +msgid "@ Help text, page 8\n" +msgstr "@\n" + +#: src/help.c:227 +msgid "@ Help text, page 9\n" +msgstr "@\n" + +#: src/help.c:228 +msgid "@ Help text, page 10\n" +msgstr "@\n" + +#: src/help.c:280 +#, c-format +msgid " How to Play " +msgstr " Kiel ludi " + +#. 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 +#, c-format +msgid "Page %d of %d" +msgstr "Paĝo %d el %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 +#, c-format +msgid "[ Press to continue ] " +msgstr "[ Premu por daŭrigi ] " + +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , +#. , , or instead of +#. , and almost any other key instead of +#. (other than , , , , +#. or <\>). +#: src/help.c:494 +#, c-format +msgid "[ Press to continue or for the previous page ] " +msgstr "[ Premu por daŭrigi aŭ por la antaŭa paĝo ] " + +#: src/intf.c:110 +#, c-format +msgid "%s: string has incorrect format: `%s'" +msgstr "%s: ĉeno havas malĝustan formon: '%s'" + +#: src/intf.c:126 +#, c-format +msgid "%s: character has illegal width: `%lc'" +msgstr "%s: signo havas malpermesatan larĝon: '%lc'" + +#: src/intf.c:434 +#, c-format +msgid "terminal size is too small (%d x %d required)" +msgstr "terminal-grando tro malgrandas (necesas %d x %d)" + +#: src/intf.c:610 +#, c-format +msgid "Star Traders" +msgstr "Star Traders" + +#: src/intf.c:1265 +#, c-format +msgid "mkchstr_conv: NUL" +msgstr "mkchstr_conv: NUL" + +#: src/intf.c:1568 +#, c-format +msgid "mkchstr: `%s'" +msgstr "mkchstr: '%s'" + +#. TRANSLATORS: This string specifies the keycodes used to insert the +#. default value into the input string, if entered as the very first +#. character. Ideally, it should contain an easily-accessible +#. keycode that would NOT be used in ordinary input. Digits, ".", +#. ",", "+" and "-" are definitely NOT acceptable. +#: src/intf.c:2020 +msgctxt "input|DefaultValue" +msgid "=;" +msgstr "=;" + +#: src/intf.c:2034 src/intf.c:2079 +#, c-format +msgid "gettxline: illegal character in string: `%ls'" +msgstr "gettxline: malpermesata signo en ĉeno: '%ls'" + +#. TRANSLATORS: The strings with msgctxt "input|Yes" and +#. "input|No" contain the keycodes used to determine whether a +#. user is answering "Yes" or "No" in response to some question. +#. Both upper and lower-case versions should be present. +#: src/intf.c:2952 +msgctxt "input|Yes" +msgid "Yy" +msgstr "JjYy" + +#: src/intf.c:2954 +msgctxt "input|No" +msgid "Nn" +msgstr "Nn" + +#. TRANSLATORS: The strings "Yes" and "No" are printed as a +#. response to user input in answer to questions like "Are you +#. sure? [Y/N] " +#: src/intf.c:3005 +msgctxt "answer" +msgid "Yes" +msgstr "Jes" + +#: src/intf.c:3007 +msgctxt "answer" +msgid "No" +msgstr "Ne" + +#: src/utils.c:199 src/utils.c:220 +#, c-format +msgid "%s: " +msgstr "%s: " + +#: src/utils.c:225 +msgid ": " +msgstr ": " + +#: src/utils.c:238 +#, c-format +msgid "out of memory" +msgstr "memoro plenpleniĝas" + +#: src/utils.c:571 +#, c-format +msgid "xmbstowcs: `%s'" +msgstr "xmbstowcs: '%s'" + +#: src/utils.c:611 +#, c-format +msgid "xwcrtomb: NUL" +msgstr "xwcrtomb: NUL" + +#: src/utils.c:616 +#, c-format +msgid "xwcrtomb: `%lc'" +msgstr "xwcrtomb: '%lc'" + +#: lib/getopt.c:547 lib/getopt.c:576 +#, c-format +msgid "%s: option '%s' is ambiguous; possibilities:" +msgstr "%s: la modifilo '%s' estas plursenca; eblecoj:" + +#: lib/getopt.c:624 lib/getopt.c:628 +#, c-format +msgid "%s: option '--%s' doesn't allow an argument\n" +msgstr "%s: la modifilo '--%s' ne permesas argumenton\n" + +#: lib/getopt.c:637 lib/getopt.c:642 +#, c-format +msgid "%s: option '%c%s' doesn't allow an argument\n" +msgstr "%s: la modifilo '%c%s' ne permesas argumenton\n" + +#: lib/getopt.c:685 lib/getopt.c:704 +#, c-format +msgid "%s: option '--%s' requires an argument\n" +msgstr "%s: la modifilo '--%s' postulas argumenton\n" + +#: lib/getopt.c:742 lib/getopt.c:745 +#, c-format +msgid "%s: unrecognized option '--%s'\n" +msgstr "%s: nerekonata modifilo '--%s'\n" + +#: lib/getopt.c:753 lib/getopt.c:756 +#, c-format +msgid "%s: unrecognized option '%c%s'\n" +msgstr "%s: nerekonata modifilo '%c%s'\n" + +#: lib/getopt.c:805 lib/getopt.c:808 +#, c-format +msgid "%s: invalid option -- '%c'\n" +msgstr "%s: malvalida modifilo -- '%c'\n" + +#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#, c-format +msgid "%s: option requires an argument -- '%c'\n" +msgstr "%s: la modifilo postulas argumenton -- '%c'\n" + +#: lib/getopt.c:934 lib/getopt.c:950 +#, c-format +msgid "%s: option '-W %s' is ambiguous\n" +msgstr "%s: la modifilo '-W %s' estas plursenca\n" + +#: lib/getopt.c:974 lib/getopt.c:992 +#, c-format +msgid "%s: option '-W %s' doesn't allow an argument\n" +msgstr "%s: la modifilo '-W %s' ne permesas argumenton\n" + +#: lib/getopt.c:1013 lib/getopt.c:1031 +#, c-format +msgid "%s: option '-W %s' requires an argument\n" +msgstr "%s: la modifilo '-W %s' postulas argumenton\n" From 91ef1d07750d4012eef2429db585a044434a3be9 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 21 Feb 2013 20:10:04 +1100 Subject: [PATCH 19/39] Add the Esperanto translation by Felipe Castro to the master branch --- NEWS | 8 ++++---- po/LINGUAS | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 12eeb4d..d7b5660 100644 --- a/NEWS +++ b/NEWS @@ -18,10 +18,10 @@ at http://www.zap.org.au/services/svn/. Version 7.5 (not yet released) ------------------------------ -Added translations for Norwegian Bokmål and Danish (in that order), with -thanks to Johnny A. Solbu and Joe Hansen. Updated auxiliary files to the -latest versions available from the Gnulib GNU Portability Library and the -GNU Autoconf project. +Added translations for Norwegian Bokmål, Danish and Esperanto (in that +order), with thanks to Johnny A. Solbu, Joe Hansen and Felipe Castro. +Updated auxiliary files to the latest versions available from the Gnulib +GNU Portability Library and the GNU Autoconf project. Version 7.4 (9th May, 2012) diff --git a/po/LINGUAS b/po/LINGUAS index a22c23e..4822791 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -34,6 +34,7 @@ en_US da de +eo fi fr hr From 0c64d8a19d68fcad560cacf55917a796811d1925 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 21 Feb 2013 22:32:41 +1100 Subject: [PATCH 20/39] Update the Esperanto translation Change the whitespacing and word-wrapping of the help text and add the standard header comment. --- po/eo.po | 134 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 71 insertions(+), 63 deletions(-) diff --git a/po/eo.po b/po/eo.po index 64fa441..bdab5c3 100644 --- a/po/eo.po +++ b/po/eo.po @@ -1,14 +1,22 @@ -# Esperanto translation of trader. -# Copyright (C) 2013 Free Software Foundation, Inc. +# ************************************************************************* +# * * +# * Esperanto Translations for Star Traders * +# * Copyright (C) 2013, John Zaitseff * +# * Copyright (C) 2013, Free Software Foundation, Inc. * +# * * +# ************************************************************************* +# # This file is distributed under the same license as the trader package. -# Felipe Castro , 2013. +# +# Contributors: +# Felipe Castro , 2013. # msgid "" msgstr "" -"Project-Id-Version: trader 7.4\n" +"Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 13:57+1000\n" -"PO-Revision-Date: 2013-02-20 15:32-0300\n" +"PO-Revision-Date: 2013-02-21 22:20+1100\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" "Language: eo\n" @@ -58,15 +66,15 @@ msgstr "" "Star Traders (%s) %s\n" "Kopirajto (C) %s, John Zaitseff.\n" "\n" -"Star Traders estas simpla ludo pri interstelara komerco, kie la celo\n" -"de la ludo estas krei kompaniojn, aĉeti kaj vendi akciojn, pruntepreni kaj\n" -"repagi monon, por fariĝi la plej riĉa ludanto (la venkanto).\n" +"Star Traders estas simpla ludo pri interstelara komerco, kie la celo de la\n" +"ludo estas krei kompaniojn, aĉeti kaj vendi akciojn, pruntepreni kaj repagi\n" +"monon, por fariĝi la plej riĉa ludanto (la venkanto).\n" "\n" "Tiu ĉi programo estas libera programaro, kiu estas disdonata sub la kondiĉoj\n" "de la GNU-a Ĝenerala Publika Permesilo, versio 3 aŭ posta. Vi estas bonvena\n" -"por modifi kaj/aŭ disdoni ĝin sub kelkaj kondiĉoj. Tiu ĉi programo venas\n" -"kun NENIU GARANTIO, laŭ plejamplekse permesite de la leĝo; konsultu la\n" -"Permesilon por pli da detaloj.\n" +"por modifi kaj/aŭ disdoni ĝin sub kelkaj kondiĉoj. Tiu ĉi programo venas kun\n" +"NENIU GARANTIO, laŭ plejamplekse permesite de la leĝo; konsultu la Permesilon\n" +"por pli da detaloj.\n" #: src/trader.c:308 #, c-format @@ -274,7 +282,7 @@ msgstr "8a" #: src/game.c:117 src/game.c:152 #, c-format msgid "Loading game %d... " -msgstr "Ŝargado de la ludo %d..." +msgstr "Ŝargado de la ludo %d... " #: src/game.c:226 #, c-format @@ -307,7 +315,7 @@ msgstr "Dd" #: src/game.c:341 src/move.c:399 #, c-format msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " -msgstr "Indiku lud-numeron [^{1^}-^{9^}] aŭ ^{^} por nuligi: " +msgstr "Indiku lud-numeron [^{1^}-^{9^}] aŭ ^{^} por nuligi: " #: src/game.c:406 #, c-format @@ -317,7 +325,7 @@ msgstr "Bonvolu indiki vian nomon: " #: src/game.c:425 #, c-format msgid "Do you need any instructions? [^{Y^}/^{N^}] " -msgstr "Ĉu vi bezonas instrukciojn? [^{J^}/^{N^}] " +msgstr "Ĉu vi bezonas instrukciojn? [^{J^}/^{N^}] " #: src/game.c:443 #, c-format @@ -633,7 +641,7 @@ msgid "" "Its name is ^{%ls^}." msgstr "" "Nova kompanio naskiĝis!\n" -"Ĝi nomiĝas ^{%ls^}." +"Ĝi nomiĝas ^{%ls^}." #: src/move.c:824 #, c-format @@ -1012,7 +1020,7 @@ msgstr "^{<4>^} Eliri la akci-interŝanĝejon" #: src/exch.c:660 #, c-format msgid "Enter selection [^{1^}-^{4^}]: " -msgstr "Indiku elekton [^{1^}-^{4^}]: " +msgstr "Indiku elekton [^{1^}-^{4^}]: " #: src/exch.c:716 #, c-format @@ -1048,7 +1056,7 @@ msgstr[1] "Vi povas aĉeti ĝis ^{%'ld^} akciojn." #: src/exch.c:739 #, c-format msgid "How many shares do you wish to purchase? " -msgstr "Kiom da akcioj vi deziras aĉeti?" +msgstr "Kiom da akcioj vi deziras aĉeti? " #: src/exch.c:760 #, c-format @@ -1070,7 +1078,7 @@ msgstr[1] "Vi povas vendi ĝis ^{%'ld^} akciojn." #: src/exch.c:774 #, c-format msgid "How many shares do you wish to sell? " -msgstr "Kiom da akcioj vi deziras vendi?" +msgstr "Kiom da akcioj vi deziras vendi? " #: src/exch.c:802 #, c-format @@ -1315,15 +1323,15 @@ msgid "" " ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" msgstr "" -"^BStar Traders^N estas simpla ludo pri interstelara komerco. Ĝia celo estas\n" -"amasigi la plej grandan kvanton da riĉeco ebla. Tion oni atingas per kreado\n" +"^BStar Traders^N estas simpla ludo pri interstelara komerco. Ĝia celo estas\n" +"amasigi la plej grandan kvanton da riĉeco ebla. Tion oni atingas per kreado\n" "de interstelaraj ŝipaj vojoj, pligrandigante ilin kaj aĉetante akciojn en la\n" -"kompanioj kiuj regas ilin. Akcioj plivaloriĝas laŭ la progreso de la\n" -"operacioj de la kompanio. Cetere, la rendimento de ĉiu akcio (procente)\n" -"ankaŭ ŝanĝas. Ludantoj povas ankaŭ pruntepreni el la Interstelara Komerca\n" +"kompanioj kiuj regas ilin. Akcioj plivaloriĝas laŭ la progreso de la\n" +"operacioj de la kompanio. Cetere, la rendimento de ĉiu akcio (procente)\n" +"ankaŭ ŝanĝas. Ludantoj povas ankaŭ pruntepreni el la Interstelara Komerca\n" "Banko por financi aldonajn aĉetojn en la akci-interŝanĝejo.\n" "\n" -"La galaksi-mapo estas reprezentata per krado ^B~x^N x ^B~y^N. Ordinara areo de ĝi\n" +"La galaksi-mapo estas reprezentata per krado ^B~x^N x ^B~y^N. Ordinara areo de ĝi\n" "povas esti:\n" "\n" " ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1350,9 +1358,9 @@ msgid "" "will set up an ^Boutpost^N, not belonging to any company. Thus, if move ^k~3^N is\n" "selected on the above map, a ^o ~+ ^N would be placed at that position.\n" msgstr "" -"La komputilo elektas hazarde ^B~m^N movojn (etikeditaj per ^k~1^N al ^k~M^N), kaj metas\n" -"ilin sur la mapo. Por elekti iun el la reliefigitaj pozicioj, premu tiun\n" -"literon. Ekzemple, kelkaj el la movoj sur la mapo povas esti:\n" +"La komputilo elektas hazarde ^B~m^N movojn (etikeditaj per ^k~1^N al ^k~M^N), kaj metas\n" +"ilin sur la mapo. Por elekti iun el la reliefigitaj pozicioj, premu tiun\n" +"literon. Ekzemple, kelkaj el la movoj sur la mapo povas esti:\n" "\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1362,9 +1370,9 @@ msgstr "" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" "\n" "\n" -"Elekti pozicion kiu ^Bne^N estas proksime de stelo (kiel la movoj ^k~1^N, ^k~3^N aŭ ^k~5^N)\n" -"rezultas en difino de ^Bpikedo^N, ne apartenanta al iu ajn kompanio. Do, se la\n" -"movo ^k~3^N estus elektata en la supra mapo, ^o ~+ ^N estus metota ĉe tiu pozicio.\n" +"Elekti pozicion kiu ^Bne^N estas proksime de stelo (kiel la movoj ^k~1^N, ^k~3^N aŭ ^k~5^N)\n" +"rezultas en difino de ^Bpikedo^N, ne apartenanta al iu ajn kompanio. Do, se la\n" +"movo ^k~3^N estus elektata en la supra mapo, ^o ~+ ^N estus metota ĉe tiu pozicio.\n" #: src/help.c:150 msgid "" @@ -1384,14 +1392,14 @@ msgid "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" msgstr "" -"Alimaniere, se pozicio proksime de stelo aŭ de alia pikedo estus elektata,\n" -"^Bkompanio^N estus kreota kaj ĝia litero estus aperonta en la mapo. Kiel\n" -"premio por kreo de kompanio, vi ricevas la unuajn kvin akciojn.\n" -"Ĝis ^B~c^N kompanioj povas esti tiel kreataj.\n" +"Alimaniere, se pozicio proksime de stelo aŭ de alia pikedo estus elektata,\n" +"^Bkompanio^N estus kreota kaj ĝia litero estus aperonta en la mapo. Kiel\n" +"premio por kreo de kompanio, vi ricevas la unuajn kvin akciojn. Ĝis ^B~c^N\n" +"kompanioj povas esti tiel kreataj.\n" "\n" -"Se pozicio proksime de kompanio estus elektata, la kompanio pliampleksigus\n" -"ĝiajn operaciojn je unu kvadrato. Tio pliigus la koston de ĝiaj akcioj kaj\n" -"tiel ankaŭ la rendimento pliiĝus. Do, se la mapo estus kiel montrate sube,\n" +"Se pozicio proksime de kompanio estus elektata, la kompanio pliampleksigus\n" +"ĝiajn operaciojn je unu kvadrato. Tio pliigus la koston de ĝiaj akcioj kaj\n" +"tiel ankaŭ la rendimento pliiĝus. Do, se la mapo estus kiel montrate sube,\n" "elekto de ^k~6^N aŭ ^k~8^N pligrandigas la ŝip-vojon de la Kompanio ^B~B^N:\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1418,9 +1426,9 @@ msgid "" "more valuable: the company's share price will increase by a greater amount\n" "than it would for outposts not next to stars.\n" msgstr "" -"Elekto de pozicio proksime de steloj plivalorigas viajn akciojn proksimume\n" -"kvinoble ol pozicio ne proksime de stelo. Do la movo ^k~6^N devus esti\n" -"preferata ol la movo ^k~8^N.\n" +"Elekto de pozicio proksime de steloj plivalorigas viajn akciojn proksimume\n" +"kvinoble ol pozicio ne proksime de stelo. Do la movo ^k~6^N devus esti preferata\n" +"ol la movo ^k~8^N.\n" "\n" " ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" @@ -1428,11 +1436,11 @@ msgstr "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" "\n" -"Vi povas ankaŭ pligrandigi iun ajn kompanion elektante poziciojn proksimajn\n" -"de pikedoj. Tiaj pikedoj estos englutitaj de tiu kompanio. Do, la movo ^k~1^N\n" -"pligrandigos la Kompanion ^B~C^N per ^Bdu^N kvadratoj. Kiel premio, pikedoj proksimaj\n" -"al steloj estas pli valoraj: la akci-prezo de la kompanio altiĝas pli ol se\n" -"la pikedo ne estas proksima de steloj.\n" +"Vi povas ankaŭ pligrandigi iun ajn kompanion elektante poziciojn proksimajn\n" +"de pikedoj. Tiaj pikedoj estos englutitaj de tiu kompanio. Do, la movo ^k~1^N\n" +"pligrandigos la Kompanion ^B~C^N per ^Bdu^N kvadratoj. Kiel premio, pikedoj prok-\n" +"simaj al steloj estas pli valoraj: la akci-prezo de la kompanio altiĝas pli\n" +"ol se la pikedo ne estas proksima de steloj.\n" #: src/help.c:186 msgid "" @@ -1453,11 +1461,11 @@ msgid "" "proportional to the amount owned in the old company. As well, a cash bonus\n" "is also paid, proportional to the percentage of the old company owned.\n" msgstr "" -"Se du kompanioj estas apartitaj en la mapo per nur unu kvadrato, tiam ili\n" -"povas esti ^Bkunfanditaj^N en unu kompanio per elekto de tiu pozicio (nur se\n" -"disponebla). Ekzemple, en la suba mapo, kompanioj ^B~A^N kaj ^B~B^N povas kunfandiĝi\n" -"per elekto de ^k~5^N. Kiam tio okazas, la kompanio kun pli da havaĵoj akiras la\n" -"alian. Ĉi tie, la kompanio ^B~B^N povus akiri la kompanion ^B~A^N. Kompanio ^B~A^N ĉesas\n" +"Se du kompanioj estas apartitaj en la mapo per nur unu kvadrato, tiam ili\n" +"povas esti ^Bkunfanditaj^N en unu kompanio per elekto de tiu pozicio (nur se\n" +"disponebla). Ekzemple, en la suba mapo, kompanioj ^B~A^N kaj ^B~B^N povas kunfandiĝi\n" +"per elekto de ^k~5^N. Kiam tio okazas, la kompanio kun pli da havaĵoj akiras la\n" +"alian. Ĉi tie, la kompanio ^B~B^N povus akiri la kompanion ^B~A^N. Kompanio ^B~A^N ĉesas\n" "ekzisti, kvankam ĝi povos reaperi kiel entute nova kompanio pli poste.\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1466,9 +1474,9 @@ msgstr "" " ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n" "\n" -"Kiam kompanioj kunfandiĝas, la ludantoj ricevas akciojn de la mastrumanta\n" +"Kiam kompanioj kunfandiĝas, la ludantoj ricevas akciojn de la mastrumanta\n" "kompanio proporcie al la kvanto posedita en la malnova kompanio. Kaj premio\n" -"estas ankaŭ pagita, proporcie al la procenta posedo de la malnova kompanio.\n" +"estas ankaŭ pagita, proporcie al la procenta posedo de la malnova kompanio.\n" #: src/help.c:205 msgid "" @@ -1489,21 +1497,21 @@ msgid "" "The ^Bwinner of the game^N is the person with the greatest net worth (total\n" "value of cash, stock and debt). ^HGood luck^N and may the best person win!\n" msgstr "" -"Tuj post kiam vi elektas vian movon, vi eniras la ^BInterstelaran akcian inter-\n" -"ŝanĝejon^N. Tie vi povas aĉeti akciojn, vendi ilin, pruntepreni el la Komerca\n" -"Banko aŭ repagi iom el via ŝuldo (se ekzistanta). Rimarku ke ĉiu kompanio\n" -"disponigas limigitan nombron da akcioj -- vi ne povas aĉeti senfine! Tamen,\n" -"vi povas peti ke pli da akcioj estu vendataj. Vi pli ŝancas sukcesi se vi\n" -"posedas pli grandan proporcion de la kompanio.\n" +"Tuj post kiam vi elektas vian movon, vi eniras la ^BInterstelaran akcian\n" +"interŝanĝejon^N. Tie vi povas aĉeti akciojn, vendi ilin, pruntepreni el la\n" +"Komerca Banko aŭ repagi iom el via ŝuldo (se ekzistanta). Rimarku ke ĉiu\n" +"kompanio disponigas limigitan nombron da akcioj -- vi ne povas aĉeti sen-\n" +"fine! Tamen, vi povas peti ke pli da akcioj estu vendataj. Vi pli ŝancas\n" +"sukcesi se vi posedas pli grandan proporcion de la kompanio.\n" "\n" -"La ludo ordinare finas post ^B~t^N cikloj. Tamen, vi povas fini la ludon pli\n" -"frue premante ^K^N kiam aldemandita elekti movon. Krome, individuaj\n" -"ludantoj povas sin deklari bankrotaj iam ajn. Se via ŝuldo estas sufiĉe\n" -"granda, la Banko povas fari tion por vi! Se vi ne plenumas la ludon en la\n" +"La ludo ordinare finas post ^B~t^N cikloj. Tamen, vi povas fini la ludon pli\n" +"frue premante ^K^N kiam aldemandita elekti movon. Krome, individuaj\n" +"ludantoj povas sin deklari bankrotaj iam ajn. Se via ŝuldo estas sufiĉe\n" +"granda, la Banko povas fari tion por vi! Se vi ne plenumas la ludon en la\n" "tempo kiun vi disponas, vi povas konservi ĝin kaj daŭrigi poste.\n" "\n" "\n" -"La ^Bvenkanto de la ludo^N estas tiu kun la plej granda totalo (entuta valoro\n" +"La ^Bvenkanto de la ludo^N estas tiu kun la plej granda totalo (entuta valoro\n" "de mono, akcioj kaj ŝuldo). ^HBonan ŝancon^N kaj ke la plej lerta venku!\n" #: src/help.c:225 From eaa5d7436d1943bba1f4fbee0573a767598161fd Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 22 Feb 2013 06:23:43 +1100 Subject: [PATCH 21/39] Update eo.po to the latest version available from TP --- po/eo.po | 162 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 77 deletions(-) diff --git a/po/eo.po b/po/eo.po index 64fa441..ba500d3 100644 --- a/po/eo.po +++ b/po/eo.po @@ -1,14 +1,22 @@ -# Esperanto translation of trader. -# Copyright (C) 2013 Free Software Foundation, Inc. +# ************************************************************************* +# * * +# * Esperanto Translations for Star Traders * +# * Copyright (C) 2013, John Zaitseff * +# * Copyright (C) 2013, Free Software Foundation, Inc. * +# * * +# ************************************************************************* +# # This file is distributed under the same license as the trader package. -# Felipe Castro , 2013. +# +# Contributors: +# Felipe Castro , 2013. # msgid "" msgstr "" "Project-Id-Version: trader 7.4\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 13:57+1000\n" -"PO-Revision-Date: 2013-02-20 15:32-0300\n" +"PO-Revision-Date: 2013-02-21 22:20+1100\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" "Language: eo\n" @@ -30,7 +38,7 @@ msgstr "%s: malvalida argumento '%s'\n" #: src/trader.c:260 #, c-format msgid "%s: invalid game number `%s'\n" -msgstr "%s: malvalida lud-numero '%s'\n" +msgstr "%s: malvalida seanc-numero '%s'\n" #: src/trader.c:269 #, c-format @@ -58,15 +66,15 @@ msgstr "" "Star Traders (%s) %s\n" "Kopirajto (C) %s, John Zaitseff.\n" "\n" -"Star Traders estas simpla ludo pri interstelara komerco, kie la celo\n" -"de la ludo estas krei kompaniojn, aĉeti kaj vendi akciojn, pruntepreni kaj\n" -"repagi monon, por fariĝi la plej riĉa ludanto (la venkanto).\n" +"Star Traders estas simpla ludo pri interstelara komerco, kie la celo de la\n" +"ludo estas krei kompaniojn, aĉeti kaj vendi akciojn, pruntepreni kaj repagi\n" +"monon, por fariĝi la plej riĉa ludanto (la venkanto).\n" "\n" "Tiu ĉi programo estas libera programaro, kiu estas disdonata sub la kondiĉoj\n" "de la GNU-a Ĝenerala Publika Permesilo, versio 3 aŭ posta. Vi estas bonvena\n" -"por modifi kaj/aŭ disdoni ĝin sub kelkaj kondiĉoj. Tiu ĉi programo venas\n" -"kun NENIU GARANTIO, laŭ plejamplekse permesite de la leĝo; konsultu la\n" -"Permesilon por pli da detaloj.\n" +"por modifi kaj/aŭ disdoni ĝin sub kelkaj kondiĉoj. Tiu ĉi programo venas kun\n" +"NENIU GARANTIO, laŭ plejamplekse permesite de la leĝo; konsultu la Permesilon\n" +"por pli da detaloj.\n" #: src/trader.c:308 #, c-format @@ -76,7 +84,7 @@ msgstr "%s: Provu '%s --help' por pli da informoj.\n" #: src/trader.c:311 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" -msgstr "Uzmaniero: %s [MODIFILO ...] [LUDO]\n" +msgstr "Uzmaniero: %s [MODIFILO ...] [SEANCO]\n" #: src/trader.c:312 #, c-format @@ -111,8 +119,8 @@ msgid "" "playing that game. If GAME is not specified, start a new game.\n" "\n" msgstr "" -"Se LUDO estas indikita kiel numero inter 1 kaj 9, ŝargi kaj daŭrigi\n" -"la ludadon. Se LUDO ne estas indikita, ekigi novan seancon.\n" +"Se SEANCO estas indikita kiel numero inter 1 kaj 9, ŝargi kaj daŭrigi\n" +"ludadon de tiu seanco. Se SEANCO ne aperas, ekigi novan seancon.\n" "\n" #. TRANSLATORS: The first %s is the proper name of the package @@ -168,7 +176,7 @@ msgstr "Betelĝuza, Klr" #: src/globals.c:49 msgid "Capella Freight Co" -msgstr "Kapela Frajto Ko" +msgstr "Capella Frajto Ko" #: src/globals.c:50 msgid "Denebola Shippers" @@ -274,7 +282,7 @@ msgstr "8a" #: src/game.c:117 src/game.c:152 #, c-format msgid "Loading game %d... " -msgstr "Ŝargado de la ludo %d..." +msgstr "Ŝargado de la seanco %d... " #: src/game.c:226 #, c-format @@ -292,7 +300,7 @@ msgstr "La unua ludanto kiu moviĝos estas ^{%ls^}." #: src/game.c:259 #, c-format msgid "Enter number of players [^{1^}-^{%d^}] or ^{^} to continue a game: " -msgstr "Indiku nombron da ludantoj [^{1^}-^{%d^}] aŭ ^{^} por daŭrigi ludon: " +msgstr "Indiku nombron da ludantoj [^{1^}-^{%d^}] aŭ ^{^} por daŭrigi seancon: " #. TRANSLATORS: This string specifies the keycodes used to continue a #. game; these must NOT contain any numeric digit from 1 to 9. The @@ -307,7 +315,7 @@ msgstr "Dd" #: src/game.c:341 src/move.c:399 #, c-format msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " -msgstr "Indiku lud-numeron [^{1^}-^{9^}] aŭ ^{^} por nuligi: " +msgstr "Indiku seanc-numeron [^{1^}-^{9^}] aŭ ^{^} por nuligi: " #: src/game.c:406 #, c-format @@ -317,7 +325,7 @@ msgstr "Bonvolu indiki vian nomon: " #: src/game.c:425 #, c-format msgid "Do you need any instructions? [^{Y^}/^{N^}] " -msgstr "Ĉu vi bezonas instrukciojn? [^{J^}/^{N^}] " +msgstr "Ĉu vi bezonas instrukciojn? [^{J^}/^{N^}] " #: src/game.c:443 #, c-format @@ -550,7 +558,7 @@ msgstr "^{<2>^} Deklari bankroton" #: src/move.c:247 #, c-format msgid "^{<3>^} Save and end the game" -msgstr "^{<3>^} Konservi kaj eliri" +msgstr "^{<3>^} Konservi seancon kaj eliri" #: src/move.c:249 #, c-format @@ -602,7 +610,7 @@ msgstr "Ĉu vi certas? [^{J^}/^{N^}] " #: src/move.c:378 src/move.c:456 #, c-format msgid "Saving game %d... " -msgstr "Konservado de la ludo %d... " +msgstr "Konservado de la seanco %d... " #: src/move.c:686 src/move.c:694 src/move.c:1052 src/move.c:1089 #, c-format @@ -633,7 +641,7 @@ msgid "" "Its name is ^{%ls^}." msgstr "" "Nova kompanio naskiĝis!\n" -"Ĝi nomiĝas ^{%ls^}." +"Ĝi nomiĝas ^{%ls^}." #: src/move.c:824 #, c-format @@ -997,7 +1005,7 @@ msgstr "^{<1>^} Aĉeti akcion el kompanio" #: src/exch.c:653 #, c-format msgid "^{<2>^} Sell stock back to company" -msgstr "^{<2>^} Vendi akcion returne al kompanio" +msgstr "^{<2>^} Vendi akcion reen al kompanio" #: src/exch.c:655 #, c-format @@ -1012,7 +1020,7 @@ msgstr "^{<4>^} Eliri la akci-interŝanĝejon" #: src/exch.c:660 #, c-format msgid "Enter selection [^{1^}-^{4^}]: " -msgstr "Indiku elekton [^{1^}-^{4^}]: " +msgstr "Indiku elekton [^{1^}-^{4^}]: " #: src/exch.c:716 #, c-format @@ -1048,7 +1056,7 @@ msgstr[1] "Vi povas aĉeti ĝis ^{%'ld^} akciojn." #: src/exch.c:739 #, c-format msgid "How many shares do you wish to purchase? " -msgstr "Kiom da akcioj vi deziras aĉeti?" +msgstr "Kiom da akcioj vi deziras aĉeti? " #: src/exch.c:760 #, c-format @@ -1070,7 +1078,7 @@ msgstr[1] "Vi povas vendi ĝis ^{%'ld^} akciojn." #: src/exch.c:774 #, c-format msgid "How many shares do you wish to sell? " -msgstr "Kiom da akcioj vi deziras vendi?" +msgstr "Kiom da akcioj vi deziras vendi? " #: src/exch.c:802 #, c-format @@ -1167,17 +1175,17 @@ msgstr "" #: src/fileio.c:316 #, c-format msgid "%s: missing header in game file" -msgstr "%s: mankas kaplinio en lud-dosiero" +msgstr "%s: mankas kaplinio en seanc-dosiero" #: src/fileio.c:319 #, c-format msgid "%s: not a valid game file" -msgstr "%s: ne estas valida lud-dosiero" +msgstr "%s: ne estas valida seanc-dosiero" #: src/fileio.c:322 src/fileio.c:329 #, c-format msgid "%s: missing subheader in game file" -msgstr "%s: mankas subkaplinio en lud-dosiero" +msgstr "%s: mankas subkaplinio en seanc-dosiero" #: src/fileio.c:325 #, c-format @@ -1315,15 +1323,15 @@ msgid "" " ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" msgstr "" -"^BStar Traders^N estas simpla ludo pri interstelara komerco. Ĝia celo estas\n" -"amasigi la plej grandan kvanton da riĉeco ebla. Tion oni atingas per kreado\n" +"^BStar Traders^N estas simpla ludo pri interstelara komerco. Ĝia celo estas\n" +"amasigi la plej grandan kvanton da riĉeco ebla. Tion oni atingas per kreado\n" "de interstelaraj ŝipaj vojoj, pligrandigante ilin kaj aĉetante akciojn en la\n" -"kompanioj kiuj regas ilin. Akcioj plivaloriĝas laŭ la progreso de la\n" -"operacioj de la kompanio. Cetere, la rendimento de ĉiu akcio (procente)\n" -"ankaŭ ŝanĝas. Ludantoj povas ankaŭ pruntepreni el la Interstelara Komerca\n" +"kompanioj kiuj regas ilin. Akcioj plivaloriĝas laŭ la progreso de la\n" +"operacioj de la kompanio. Cetere, la rendimento de ĉiu akcio (procente)\n" +"ankaŭ ŝanĝas. Ludantoj povas ankaŭ pruntepreni el la Interstelara Komerca\n" "Banko por financi aldonajn aĉetojn en la akci-interŝanĝejo.\n" "\n" -"La galaksi-mapo estas reprezentata per krado ^B~x^N x ^B~y^N. Ordinara areo de ĝi\n" +"La galaksi-mapo estas reprezentata per krado ^B~x^N x ^B~y^N. Ordinara areo de ĝi\n" "povas esti:\n" "\n" " ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1350,9 +1358,9 @@ msgid "" "will set up an ^Boutpost^N, not belonging to any company. Thus, if move ^k~3^N is\n" "selected on the above map, a ^o ~+ ^N would be placed at that position.\n" msgstr "" -"La komputilo elektas hazarde ^B~m^N movojn (etikeditaj per ^k~1^N al ^k~M^N), kaj metas\n" -"ilin sur la mapo. Por elekti iun el la reliefigitaj pozicioj, premu tiun\n" -"literon. Ekzemple, kelkaj el la movoj sur la mapo povas esti:\n" +"La komputilo elektas hazarde ^B~m^N movojn (etikeditaj per ^k~1^N al ^k~M^N), kaj metas\n" +"ilin sur la mapo. Por elekti iun el la reliefigitaj pozicioj, premu tiun\n" +"literon. Ekzemple, kelkaj el la movoj sur la mapo povas esti:\n" "\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1362,9 +1370,9 @@ msgstr "" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" "\n" "\n" -"Elekti pozicion kiu ^Bne^N estas proksime de stelo (kiel la movoj ^k~1^N, ^k~3^N aŭ ^k~5^N)\n" -"rezultas en difino de ^Bpikedo^N, ne apartenanta al iu ajn kompanio. Do, se la\n" -"movo ^k~3^N estus elektata en la supra mapo, ^o ~+ ^N estus metota ĉe tiu pozicio.\n" +"Elekti pozicion kiu ^Bne^N estas proksime de stelo (kiel la movoj ^k~1^N, ^k~3^N aŭ ^k~5^N)\n" +"rezultas en difino de ^Bpikedo^N, ne apartenanta al iu ajn kompanio. Do, se la\n" +"movo ^k~3^N estus elektata en la supra mapo, ^o ~+ ^N estus metota ĉe tiu pozicio.\n" #: src/help.c:150 msgid "" @@ -1384,19 +1392,19 @@ msgid "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" msgstr "" -"Alimaniere, se pozicio proksime de stelo aŭ de alia pikedo estus elektata,\n" -"^Bkompanio^N estus kreota kaj ĝia litero estus aperonta en la mapo. Kiel\n" -"premio por kreo de kompanio, vi ricevas la unuajn kvin akciojn.\n" -"Ĝis ^B~c^N kompanioj povas esti tiel kreataj.\n" +"Alimaniere, se pozicio proksime de stelo aŭ de alia pikedo estus elektata,\n" +"^Bkompanio^N estus kreota kaj ĝia litero estus aperonta en la mapo. Kiel\n" +"premio por kreo de kompanio, vi ricevas la unuajn kvin akciojn. Ĝis ^B~c^N\n" +"kompanioj povas esti tiel kreataj.\n" "\n" -"Se pozicio proksime de kompanio estus elektata, la kompanio pliampleksigus\n" -"ĝiajn operaciojn je unu kvadrato. Tio pliigus la koston de ĝiaj akcioj kaj\n" -"tiel ankaŭ la rendimento pliiĝus. Do, se la mapo estus kiel montrate sube,\n" -"elekto de ^k~6^N aŭ ^k~8^N pligrandigas la ŝip-vojon de la Kompanio ^B~B^N:\n" +"Se pozicio proksime de kompanio estus elektata, la kompanio pliampleksigus\n" +"ĝiajn operaciojn je unu kvadrato. Tio pliigus la koston de ĝiaj akcioj kaj\n" +"tiel ankaŭ la rendimento pliiĝus. Do, se la mapo estus kiel montrate sube,\n" +"elekto de ^k~6^N aŭ ^k~8^N pligrandigas la ŝip-vojon de la kompanio ^B~B^N:\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" -" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Movoj ^k~6^N aŭ ^k~8^N pligrandigas Kompanion ^B~B^N.\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Movoj ^k~6^N aŭ ^k~8^N pligrandigas kompanion ^B~B^N.\n" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" @@ -1418,9 +1426,9 @@ msgid "" "more valuable: the company's share price will increase by a greater amount\n" "than it would for outposts not next to stars.\n" msgstr "" -"Elekto de pozicio proksime de steloj plivalorigas viajn akciojn proksimume\n" -"kvinoble ol pozicio ne proksime de stelo. Do la movo ^k~6^N devus esti\n" -"preferata ol la movo ^k~8^N.\n" +"Elekto de pozicio proksime de steloj plivalorigas viajn akciojn proksimume\n" +"kvinoble ol pozicio ne proksime de stelo. Do la movo ^k~6^N devus esti preferata\n" +"ol la movo ^k~8^N.\n" "\n" " ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" @@ -1428,11 +1436,11 @@ msgstr "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" "\n" -"Vi povas ankaŭ pligrandigi iun ajn kompanion elektante poziciojn proksimajn\n" -"de pikedoj. Tiaj pikedoj estos englutitaj de tiu kompanio. Do, la movo ^k~1^N\n" -"pligrandigos la Kompanion ^B~C^N per ^Bdu^N kvadratoj. Kiel premio, pikedoj proksimaj\n" -"al steloj estas pli valoraj: la akci-prezo de la kompanio altiĝas pli ol se\n" -"la pikedo ne estas proksima de steloj.\n" +"Vi povas ankaŭ pligrandigi iun ajn kompanion elektante poziciojn proksimajn\n" +"de pikedoj. Tiaj pikedoj estos englutitaj de tiu kompanio. Do, la movo ^k~1^N\n" +"pligrandigos la kompanion ^B~C^N per ^Bdu^N kvadratoj. Kiel premio, pikedoj prok-\n" +"simaj al steloj estas pli valoraj: la akci-prezo de la kompanio altiĝas pli\n" +"ol se la pikedo ne estas proksima de steloj.\n" #: src/help.c:186 msgid "" @@ -1453,11 +1461,11 @@ msgid "" "proportional to the amount owned in the old company. As well, a cash bonus\n" "is also paid, proportional to the percentage of the old company owned.\n" msgstr "" -"Se du kompanioj estas apartitaj en la mapo per nur unu kvadrato, tiam ili\n" -"povas esti ^Bkunfanditaj^N en unu kompanio per elekto de tiu pozicio (nur se\n" -"disponebla). Ekzemple, en la suba mapo, kompanioj ^B~A^N kaj ^B~B^N povas kunfandiĝi\n" -"per elekto de ^k~5^N. Kiam tio okazas, la kompanio kun pli da havaĵoj akiras la\n" -"alian. Ĉi tie, la kompanio ^B~B^N povus akiri la kompanion ^B~A^N. Kompanio ^B~A^N ĉesas\n" +"Se du kompanioj estas apartitaj en la mapo per nur unu kvadrato, tiam ili\n" +"povas esti ^Bkunfanditaj^N en unu kompanio per elekto de tiu pozicio (nur se\n" +"disponebla). Ekzemple, en la suba mapo, kompanioj ^B~A^N kaj ^B~B^N povas kunfandiĝi\n" +"per elekto de ^k~5^N. Kiam tio okazas, la kompanio kun pli da havaĵoj akiras la\n" +"alian. Ĉi tie, la kompanio ^B~B^N povus akiri la kompanion ^B~A^N. Kompanio ^B~A^N ĉesas\n" "ekzisti, kvankam ĝi povos reaperi kiel entute nova kompanio pli poste.\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1466,9 +1474,9 @@ msgstr "" " ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n" "\n" -"Kiam kompanioj kunfandiĝas, la ludantoj ricevas akciojn de la mastrumanta\n" +"Kiam kompanioj kunfandiĝas, la ludantoj ricevas akciojn de la mastrumanta\n" "kompanio proporcie al la kvanto posedita en la malnova kompanio. Kaj premio\n" -"estas ankaŭ pagita, proporcie al la procenta posedo de la malnova kompanio.\n" +"estas ankaŭ pagita, proporcie al la procenta posedo de la malnova kompanio.\n" #: src/help.c:205 msgid "" @@ -1489,21 +1497,21 @@ msgid "" "The ^Bwinner of the game^N is the person with the greatest net worth (total\n" "value of cash, stock and debt). ^HGood luck^N and may the best person win!\n" msgstr "" -"Tuj post kiam vi elektas vian movon, vi eniras la ^BInterstelaran akcian inter-\n" -"ŝanĝejon^N. Tie vi povas aĉeti akciojn, vendi ilin, pruntepreni el la Komerca\n" -"Banko aŭ repagi iom el via ŝuldo (se ekzistanta). Rimarku ke ĉiu kompanio\n" -"disponigas limigitan nombron da akcioj -- vi ne povas aĉeti senfine! Tamen,\n" -"vi povas peti ke pli da akcioj estu vendataj. Vi pli ŝancas sukcesi se vi\n" -"posedas pli grandan proporcion de la kompanio.\n" +"Tuj post kiam vi elektas vian movon, vi eniras la ^BInterstelaran akcian\n" +"interŝanĝejon^N. Tie vi povas aĉeti akciojn, vendi ilin, pruntepreni el la\n" +"Komerca Banko aŭ repagi iom el via ŝuldo (se ekzistanta). Rimarku ke ĉiu\n" +"kompanio disponigas limigitan nombron da akcioj -- vi ne povas aĉeti sen-\n" +"fine! Tamen, vi povas peti ke pli da akcioj estu vendataj. Vi pli ŝancas\n" +"sukcesi se vi posedas pli grandan proporcion de la kompanio.\n" "\n" -"La ludo ordinare finas post ^B~t^N cikloj. Tamen, vi povas fini la ludon pli\n" -"frue premante ^K^N kiam aldemandita elekti movon. Krome, individuaj\n" -"ludantoj povas sin deklari bankrotaj iam ajn. Se via ŝuldo estas sufiĉe\n" -"granda, la Banko povas fari tion por vi! Se vi ne plenumas la ludon en la\n" -"tempo kiun vi disponas, vi povas konservi ĝin kaj daŭrigi poste.\n" +"La ludo ordinare finas post ^B~t^N cikloj. Tamen, vi povas fini la ludon pli\n" +"frue premante ^K^N kiam aldemandita elekti movon. Krome, individuaj\n" +"ludantoj povas sin deklari bankrotaj iam ajn. Se via ŝuldo estas sufiĉe\n" +"granda, la banko povas fari tion por vi! Se vi ne plenumas la ludon en la\n" +"tempo kiun vi disponas, vi povas konservi seancon kaj daŭrigi ĝin poste.\n" "\n" "\n" -"La ^Bvenkanto de la ludo^N estas tiu kun la plej granda totalo (entuta valoro\n" +"La ^Bvenkanto de la ludo^N estas tiu kun la plej granda totalo (entuta valoro\n" "de mono, akcioj kaj ŝuldo). ^HBonan ŝancon^N kaj ke la plej lerta venku!\n" #: src/help.c:225 From 207be541458da0282f4f99ae1d7151cf6e696aeb Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 25 Apr 2013 22:18:54 +1000 Subject: [PATCH 22/39] Default keys are now set by a locale string, not by macros --- src/intf.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/intf.h b/src/intf.h index 4afea70..54b0b01 100644 --- a/src/intf.h +++ b/src/intf.h @@ -622,10 +622,10 @@ extern int gettxchar (WINDOW *win, wint_t *restrict wch); way (including if the user made any changed, spaces were stripped or if emptyval was copied into buf[]). - If either KEY_DEFVAL1 or KEY_DEFVAL2 is pressed when the input line is - empty, the string pointed to by defaultval (if not NULL) is placed in - the buffer as if typed by the user. Editing is NOT terminated in this - case. + If a key matching any character in the string "input|DefaultValue" (by + default, "=;") is pressed when the input line is empty, the string + pointed to by defaultval (if not NULL) is placed in the buffer as if + typed by the user. Editing is NOT terminated in this case. If allowed is not NULL, only characters in that string are allowed to be entered into the input line. For example, if allowed points to From 9450fed943af15a7c47568b8025c622dd305b230 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 22 May 2014 11:05:51 +1000 Subject: [PATCH 23/39] Update the copyright year to 2014 --- COPYING | 2 +- INSTALL | 2 +- Makefile.am | 2 +- NEWS | 2 +- README | 4 ++-- build-aux/README | 2 +- configure.ac | 2 +- doc/Makefile.am | 2 +- doc/README | 2 +- doc/trader.6 | 6 +++--- lib/README | 2 +- m4/Makefile.am | 2 +- m4/README | 2 +- po/LINGUAS | 2 +- po/Makevars | 2 +- po/POTFILES.in | 2 +- po/README | 2 +- po/da.po | 4 ++-- po/de.po | 4 ++-- po/en_AU.po | 6 +++--- po/en_CA.po | 6 +++--- po/en_GB.po | 6 +++--- po/en_US.po | 6 +++--- po/eo.po | 4 ++-- po/fi.po | 4 ++-- po/fr.po | 3 ++- po/hr.po | 4 ++-- po/nb.po | 4 ++-- po/ru.po | 6 +++--- src/Makefile.am | 2 +- src/README | 2 +- src/exch.c | 2 +- src/exch.h | 2 +- src/fileio.c | 2 +- src/fileio.h | 2 +- src/game.c | 2 +- src/game.h | 2 +- src/globals.c | 2 +- src/globals.h | 2 +- src/help.c | 2 +- src/help.h | 2 +- src/intf.c | 2 +- src/intf.h | 2 +- src/move.c | 2 +- src/move.h | 2 +- src/system.h | 2 +- src/trader.c | 4 ++-- src/trader.h | 2 +- src/utils.c | 2 +- src/utils.h | 2 +- 50 files changed, 71 insertions(+), 70 deletions(-) diff --git a/COPYING b/COPYING index 0297f89..d265617 100644 --- a/COPYING +++ b/COPYING @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************** diff --git a/INSTALL b/INSTALL index 5291295..2ca2683 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************** diff --git a/Makefile.am b/Makefile.am index 31d167f..8010c9d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2013, John Zaitseff # +# Copyright (C) 1990-2014, John Zaitseff # # # ######################################################################### diff --git a/NEWS b/NEWS index d7b5660..2bb9074 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************** diff --git a/README b/README index 1e8e60a..0f59a23 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************** @@ -67,7 +67,7 @@ welcomed! Please send these to: Copyright ========= -Copyright (C) 1990-2013, John Zaitseff. +Copyright (C) 1990-2014, John Zaitseff. Star Traders is free software that is distributed under the terms of the GNU General Public License. You can redistribute it and/or modify it diff --git a/build-aux/README b/build-aux/README index c62d777..d828472 100644 --- a/build-aux/README +++ b/build-aux/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************** diff --git a/configure.ac b/configure.ac index b2111d0..f93d444 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl ********************************************************************* dnl * * dnl * Star Traders: A Game of Interstellar Trading * -dnl * Copyright (C) 1990-2013, John Zaitseff * +dnl * Copyright (C) 1990-2014, John Zaitseff * dnl * * dnl ********************************************************************* dnl diff --git a/doc/Makefile.am b/doc/Makefile.am index 3f8a4f3..b49492a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2013, John Zaitseff # +# Copyright (C) 1990-2014, John Zaitseff # # # ######################################################################### diff --git a/doc/README b/doc/README index dbcff39..4b63e97 100644 --- a/doc/README +++ b/doc/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************** diff --git a/doc/trader.6 b/doc/trader.6 index db18e87..b76f326 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -1,7 +1,7 @@ .\" ********************************************************************* .\" * * .\" * Star Traders: A Game of Interstellar Trading * -.\" * Copyright (C) 1990-2013, John Zaitseff * +.\" * Copyright (C) 1990-2014, John Zaitseff * .\" * * .\" ********************************************************************* .\" @@ -41,7 +41,7 @@ .if \n[.g] .mso www.tmac .\" .\" ********************************************************************* -.TH TRADER 6 "2nd February, 2013" "Unix-like systems" +.TH TRADER 6 "22nd May, 2014" "Unix-like systems" .SH NAME trader \- a game of interstellar trading .\" ********************************************************************* @@ -200,7 +200,7 @@ Australia .PP .\" ********************************************************************* .SH COPYRIGHT -Copyright \(co 1990\-2013, John Zaitseff. +Copyright \(co 1990\-2014, John Zaitseff. .PP \fBStar Traders\fR is free software that is distributed under the terms of the GNU General Public License. You can redistribute it and/or modify diff --git a/lib/README b/lib/README index 9a24d0d..17d07eb 100644 --- a/lib/README +++ b/lib/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************** diff --git a/m4/Makefile.am b/m4/Makefile.am index 8af21b6..80e9201 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2013, John Zaitseff # +# Copyright (C) 1990-2014, John Zaitseff # # # ######################################################################### diff --git a/m4/README b/m4/README index 3778fad..896d50c 100644 --- a/m4/README +++ b/m4/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************** diff --git a/po/LINGUAS b/po/LINGUAS index 4822791..06c1466 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2013, John Zaitseff # +# Copyright (C) 1990-2014, John Zaitseff # # # ######################################################################### diff --git a/po/Makevars b/po/Makevars index 8352e3f..26e8944 100644 --- a/po/Makevars +++ b/po/Makevars @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2013, John Zaitseff # +# Copyright (C) 1990-2014, John Zaitseff # # # ######################################################################### diff --git a/po/POTFILES.in b/po/POTFILES.in index 9d5c97d..1a96342 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2013, John Zaitseff # +# Copyright (C) 1990-2014, John Zaitseff # # # ######################################################################### diff --git a/po/README b/po/README index 44c09da..498336c 100644 --- a/po/README +++ b/po/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************** diff --git a/po/da.po b/po/da.po index 1c5eefb..645b290 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Danish Translations for Star Traders * -# * Copyright (C) 2012-13, John Zaitseff * +# * Copyright (C) 2012-14, John Zaitseff * # * * # ************************************************************************* # @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2013-01-18 18:12+1100\n" -"PO-Revision-Date: 2013-02-02 14:26+1100\n" +"PO-Revision-Date: 2014-05-22 10:57+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 a1988a1..5209e34 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * German Translations for Star Traders * -# * Copyright (C) 2012-13, John Zaitseff * +# * Copyright (C) 2012-14, John Zaitseff * # * * # ************************************************************************* # @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2013-02-02 10:43+1100\n" +"PO-Revision-Date: 2014-05-22 10:57+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 e4f7ecd..b950711 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (Australian) Translations for Star Traders * -# * Copyright (C) 1990-2013, John Zaitseff * +# * Copyright (C) 1990-2014, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011-13. +# John Zaitseff , 2011-14. # msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2013-02-02 10:44+1100\n" +"PO-Revision-Date: 2014-05-22 10:57+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" "Language: en_AU\n" diff --git a/po/en_CA.po b/po/en_CA.po index 9e04532..3d0f029 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (Canadian) Translations for Star Traders * -# * Copyright (C) 1990-2013, John Zaitseff * +# * Copyright (C) 1990-2014, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011-13. +# John Zaitseff , 2011-14. # msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2013-02-02 10:44+1100\n" +"PO-Revision-Date: 2014-05-22 10:58+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" "Language: en_CA\n" diff --git a/po/en_GB.po b/po/en_GB.po index 709071b..17f943a 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (British) Translations for Star Traders * -# * Copyright (C) 1990-2013, John Zaitseff * +# * Copyright (C) 1990-2014, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011-13. +# John Zaitseff , 2011-14. # msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2013-02-02 10:45+1100\n" +"PO-Revision-Date: 2014-05-22 10:58+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" "Language: en_GB\n" diff --git a/po/en_US.po b/po/en_US.po index ec2cc99..0965f23 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (US) Translations for Star Traders * -# * Copyright (C) 1990-2013, John Zaitseff * +# * Copyright (C) 1990-2014, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011-13. +# John Zaitseff , 2011-14. # msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2013-02-02 10:45+1100\n" +"PO-Revision-Date: 2014-05-22 10:58+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" "Language: en_US\n" diff --git a/po/eo.po b/po/eo.po index 71ef84a..d347591 100644 --- a/po/eo.po +++ b/po/eo.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Esperanto Translations for Star Traders * -# * Copyright (C) 2013, John Zaitseff * +# * Copyright (C) 2013-14, John Zaitseff * # * Copyright (C) 2013, Free Software Foundation, Inc. * # * * # ************************************************************************* @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 13:57+1000\n" -"PO-Revision-Date: 2013-02-22 06:38+1100\n" +"PO-Revision-Date: 2014-05-22 10:59+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 b34a787..6272157 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Finnish Translations for Star Traders * -# * Copyright (C) 2012-13, John Zaitseff * +# * Copyright (C) 2012-14, John Zaitseff * # * Copyright (C) 2012, Free Software Foundation, Inc. * # * * # ************************************************************************* @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2013-02-02 10:46+1100\n" +"PO-Revision-Date: 2014-05-22 10:59+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 69e1816..086f96c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,6 +1,7 @@ # ************************************************************************* # * * # * French Translations for Star Traders * +# * Copyright (C) 2012-14, John Zaitseff * # * Copyright (C) 2012-13, Free Software Foundation, Inc. * # * * # ************************************************************************* @@ -14,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2013-02-02 10:46+1100\n" +"PO-Revision-Date: 2014-05-22 11:00+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 969cdc0..67ae044 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Croatian Translations for Star Traders * -# * Copyright (C) 2012-13, John Zaitseff * +# * Copyright (C) 2012-14, John Zaitseff * # * * # ************************************************************************* # @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2013-02-02 10:47+1100\n" +"PO-Revision-Date: 2014-05-22 11:00+1000\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" "Language: hr\n" diff --git a/po/nb.po b/po/nb.po index 8bd14e8..cf85f18 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Norwegian Bokmål Translations for Star Traders * -# * Copyright (C) 2012-13, John Zaitseff * +# * Copyright (C) 2012-14, John Zaitseff * # * * # ************************************************************************* # @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 13:57+1000\n" -"PO-Revision-Date: 2013-02-02 10:47+1100\n" +"PO-Revision-Date: 2014-05-22 11:00+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 01cb63f..70bbf55 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,14 +2,14 @@ # * * # * Russian Translations for Star Traders * # * Русский перевод для игры «Звёздные торговцы» * -# * Copyright (C) 1990-2013, John Zaitseff * +# * Copyright (C) 1990-2014, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same license as the trader package. # # Contributors: -# John Zaitseff , 2011-12. +# John Zaitseff , 2011-14. # Vladimir B. Tsarkov , 2012. # Pavel Maryanov , 2012. # @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-05-09 07:02+1000\n" -"PO-Revision-Date: 2013-02-02 10:48+1100\n" +"PO-Revision-Date: 2014-05-22 11:01+1000\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" "Language: ru\n" diff --git a/src/Makefile.am b/src/Makefile.am index b965de6..e4f6429 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2013, John Zaitseff # +# Copyright (C) 1990-2014, John Zaitseff # # # ######################################################################### diff --git a/src/README b/src/README index f4ebea4..599f2bf 100644 --- a/src/README +++ b/src/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************** diff --git a/src/exch.c b/src/exch.c index 3d5d334..4cc55d9 100644 --- a/src/exch.c +++ b/src/exch.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/exch.h b/src/exch.h index 1eebce7..0035df5 100644 --- a/src/exch.h +++ b/src/exch.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/fileio.c b/src/fileio.c index 7c75cd3..c04dee6 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/fileio.h b/src/fileio.h index 950a6ce..5937b5e 100644 --- a/src/fileio.h +++ b/src/fileio.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/game.c b/src/game.c index 2e6b269..47c4f44 100644 --- a/src/game.c +++ b/src/game.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/game.h b/src/game.h index 821efac..f69f1b1 100644 --- a/src/game.h +++ b/src/game.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/globals.c b/src/globals.c index 9a02541..b447cdf 100644 --- a/src/globals.c +++ b/src/globals.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/globals.h b/src/globals.h index c3015bb..c442881 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/help.c b/src/help.c index c96d3a5..d4cf370 100644 --- a/src/help.c +++ b/src/help.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/help.h b/src/help.h index 4bd78a7..bda7ad9 100644 --- a/src/help.h +++ b/src/help.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/intf.c b/src/intf.c index 3b4ca9b..83eb644 100644 --- a/src/intf.c +++ b/src/intf.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/intf.h b/src/intf.h index 54b0b01..3571634 100644 --- a/src/intf.h +++ b/src/intf.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/move.c b/src/move.c index 0b2e849..7f48264 100644 --- a/src/move.c +++ b/src/move.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/move.h b/src/move.h index 21de729..0026c46 100644 --- a/src/move.h +++ b/src/move.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/system.h b/src/system.h index 1cc2dd5..104cc3a 100644 --- a/src/system.h +++ b/src/system.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/trader.c b/src/trader.c index 3a578be..71c55ce 100644 --- a/src/trader.c +++ b/src/trader.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ @@ -293,7 +293,7 @@ This program is free software that is distributed under the terms of the\n\ GNU General Public License, version 3 or later. You are welcome to\n\ modify and/or distribute it under certain conditions. This program has\n\ NO WARRANTY, to the extent permitted by law; see the License for details.\n\ -"), program_name, PACKAGE_VERSION, "1990-2013"); +"), program_name, PACKAGE_VERSION, "1990-2014"); exit(EXIT_SUCCESS); } diff --git a/src/trader.h b/src/trader.h index 5279136..47bfe78 100644 --- a/src/trader.h +++ b/src/trader.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/utils.c b/src/utils.c index 5f013a8..2a0f779 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ diff --git a/src/utils.h b/src/utils.h index c874bd1..b23254f 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2013, John Zaitseff * +* Copyright (C) 1990-2014, John Zaitseff * * * ************************************************************************/ From 7376d26b538f08f473d6161893896e9b69714447 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 22 May 2014 11:11:28 +1000 Subject: [PATCH 24/39] Update files to the latest version from the GNU Autoconf archive --- m4/ax_cflags_warn_all.m4 | 4 ++-- m4/ax_with_curses.m4 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/m4/ax_cflags_warn_all.m4 b/m4/ax_cflags_warn_all.m4 index 0fa3e18..1f07799 100644 --- a/m4/ax_cflags_warn_all.m4 +++ b/m4/ax_cflags_warn_all.m4 @@ -58,7 +58,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 14 +#serial 15 AC_DEFUN([AX_FLAGS_WARN_ALL],[dnl AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl @@ -84,7 +84,7 @@ done FLAGS="$ac_save_[]FLAGS" ]) AS_VAR_POPDEF([FLAGS])dnl -AC_REQUIRE([AX_APPEND_FLAG]) +AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) case ".$VAR" in .ok|.ok,*) m4_ifvaln($3,$3) ;; .|.no|.no,*) m4_default($4,[m4_ifval($2,[AX_APPEND_FLAG([$2], [$1])])]) ;; diff --git a/m4/ax_with_curses.m4 b/m4/ax_with_curses.m4 index 33a37ac..e4cbd31 100644 --- a/m4/ax_with_curses.m4 +++ b/m4/ax_with_curses.m4 @@ -88,7 +88,7 @@ # # AX_WITH_CURSES # if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then -# AX_MSG_ERROR([requires either NcursesW or Ncurses library]) +# AC_MSG_ERROR([requires either NcursesW or Ncurses library]) # fi # # If any Curses library will do (but one must be present and must support @@ -182,7 +182,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 13 +#serial 15 AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES]) AC_DEFUN([AX_WITH_CURSES], [ From 39e978ae9183a9cbe013db1b699fb5eae5d546b5 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 22 May 2014 11:16:18 +1000 Subject: [PATCH 25/39] Update to the latest version of the GNU Portability Library --- m4/.gitignore | 1 + m4/gnulib-cache.m4 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/m4/.gitignore b/m4/.gitignore index a16cf9a..e6582ea 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -1,4 +1,5 @@ 00gnulib.m4 +absolute-header.m4 assert.m4 btowc.m4 codeset.m4 diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index 9a93f9c..bcd448d 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 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 From 4216b21324c09c1e8a309319d6ade0ec3acc0f47 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 22 May 2014 11:26:33 +1000 Subject: [PATCH 26/39] Add the newly-required ax_require_defined Autoconf macro --- m4/ax_require_defined.m4 | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 m4/ax_require_defined.m4 diff --git a/m4/ax_require_defined.m4 b/m4/ax_require_defined.m4 new file mode 100644 index 0000000..cae1111 --- /dev/null +++ b/m4/ax_require_defined.m4 @@ -0,0 +1,37 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_require_defined.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_REQUIRE_DEFINED(MACRO) +# +# DESCRIPTION +# +# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have +# been defined and thus are available for use. This avoids random issues +# where a macro isn't expanded. Instead the configure script emits a +# non-fatal: +# +# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found +# +# It's like AC_REQUIRE except it doesn't expand the required macro. +# +# Here's an example: +# +# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) +# +# LICENSE +# +# Copyright (c) 2014 Mike Frysinger +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 1 + +AC_DEFUN([AX_REQUIRE_DEFINED], [dnl + m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) +])dnl AX_REQUIRE_DEFINED From cec51ded7d41586eea9e218031b45c8d2154b6ed Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 22 May 2014 11:45:57 +1000 Subject: [PATCH 27/39] Update to GNU Gettext 0.18.3 --- po/Makefile.in.in | 20 +++++++++++++++----- po/Makevars | 30 ++++++++++++++++++------------ po/Rules-quot | 4 ++-- 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 83d8838..fabdc76 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -8,13 +8,14 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.18 +# Origin: gettext-0.18.3 GETTEXT_MACRO_VERSION = 0.18 PACKAGE = @PACKAGE@ VERSION = @VERSION@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +SED = @SED@ SHELL = /bin/sh @SET_MAKE@ @@ -96,14 +97,14 @@ CATALOGS = @CATALOGS@ mv t-$@ $@ -all: check-macro-version all-@USE_NLS@ +all: all-@USE_NLS@ all-yes: stamp-po all-no: # Ensure that the gettext macros and this Makefile.in.in are in sync. -check-macro-version: - @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ +CHECK_MACRO_VERSION = \ + test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ exit 1; \ } @@ -123,6 +124,7 @@ check-macro-version: # $(POFILES) has been designed to not touch files that don't need to be # changed. stamp-po: $(srcdir)/$(DOMAIN).pot + @$(CHECK_MACRO_VERSION) test ! -f $(srcdir)/$(DOMAIN).pot || \ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) @test ! -f $(srcdir)/$(DOMAIN).pot || { \ @@ -137,8 +139,16 @@ stamp-po: $(srcdir)/$(DOMAIN).pot # This target rebuilds $(DOMAIN).pot; it is an expensive operation. # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +# The determination of whether the package xyz is a GNU one is based on the +# heuristic whether some file in the top level directory mentions "GNU xyz". +# If GNU 'find' is available, we avoid grepping through monster files. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed - if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ + if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ + LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \ + else \ + LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ + fi; \ + } | grep -v 'libtool:' >/dev/null; then \ package_gnu='GNU '; \ else \ package_gnu=''; \ diff --git a/po/Makevars b/po/Makevars index 26e8944..1e463fd 100644 --- a/po/Makevars +++ b/po/Makevars @@ -26,14 +26,14 @@ # along with this program. If not, see http://www.gnu.org/licenses/. -# The message domain is the same as the package name +# The message domain is the same as the package name. DOMAIN = $(PACKAGE) -# These two variables depend on the location of this directory +# These two variables depend on the location of this directory. subdir = po top_builddir = .. -# These options get passed to xgettext +# These options get passed to xgettext. XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --width=132 \ --flag='err_exit:1:c-format' --flag='errno_exit:1:c-format' \ --flag='txdlgbox:11:c-format' --flag='txdlgbox:12:c-format' \ @@ -42,20 +42,26 @@ XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --width=132 \ --flag='center:8:c-format' \ --flag='right:8:c-format' -# These options get passed to msgmerge -MSGMERGE_OPTIONS = --width=132 - -# Copyright holder that gets inserted into the header of the +# This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. COPYRIGHT_HOLDER = John Zaitseff -# E-mail address or URL used by translators to report bugs in the -# untranslated (original) strings +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings. MSGID_BUGS_ADDRESS = J.Zaitseff@zap.org.au -# List of locale categories, beyond LC_MESSAGES, for which the message -# catalogs shall be used. It is usually empty. +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = -# Additional files to distribute +# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' +# context. Possible values are "yes" and "no". Set this to yes if the +# package uses functions taking also a message context, like pgettext(), or +# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. +USE_MSGCTXT = yes + +# These options get passed to msgmerge. +MSGMERGE_OPTIONS = --width=132 + +# Additional files to distribute. DISTFILES += README diff --git a/po/Rules-quot b/po/Rules-quot index af52487..5931e53 100644 --- a/po/Rules-quot +++ b/po/Rules-quot @@ -14,13 +14,13 @@ en@boldquot.po-update: en@boldquot.po-update-en .insert-header.po-update-en: @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ From 549b2d517dbfa12e4d7495a876c27de00c5511be Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 22 May 2014 15:34:32 +1000 Subject: [PATCH 28/39] Use separate input and output buffers for scramble() and unscramble() --- src/fileio.c | 50 ++++++++++++++++++++++++++++----------------- src/trader.h | 2 +- src/utils.c | 45 +++++++++++++++++++++++++++++++++-------- src/utils.h | 57 ++++++++++++++++++++++++++++++++-------------------- 4 files changed, 105 insertions(+), 49 deletions(-) diff --git a/src/fileio.c b/src/fileio.c index c04dee6..335e03d 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -51,12 +51,13 @@ static const unsigned char game_file_crypt_key[] = { #define load_game_scanf(_fmt, _var, _cond) \ do { \ - if (fgets(buf, BUFSIZE, file) == NULL) { \ + if (fgets(bigbuf, BIGBUFSIZE, file) == NULL) { \ err_exit(_("%s: missing field on line %d"), \ filename, lineno); \ } \ - if (sscanf(unscramble(crypt_key, buf, BUFSIZE), _fmt "\n", \ - &(_var)) != 1) { \ + if (sscanf(unscramble(&crypt_key, bigbuf, BIGBUFSIZE, \ + buf, BUFSIZE), _fmt "\n", &(_var)) \ + != 1) { \ err_exit(_("%s: illegal field on line %d: `%s'"), \ filename, lineno, buf); \ } \ @@ -88,11 +89,12 @@ static const unsigned char game_file_crypt_key[] = { char *s; \ int len; \ \ - if (fgets(buf, BUFSIZE, file) == NULL) { \ + if (fgets(bigbuf, BIGBUFSIZE, file) == NULL) { \ err_exit(_("%s: missing field on line %d"), \ filename, lineno); \ } \ - if (strlen(unscramble(crypt_key, buf, BUFSIZE)) == 0) { \ + if (strlen(unscramble(&crypt_key, bigbuf, BIGBUFSIZE, \ + buf, BUFSIZE)) == 0) { \ err_exit(_("%s: illegal value on line %d"), \ filename, lineno); \ } \ @@ -127,11 +129,12 @@ static const unsigned char game_file_crypt_key[] = { char *s; \ int len; \ \ - if (fgets(buf, BUFSIZE, file) == NULL) { \ + if (fgets(bigbuf, BIGBUFSIZE, file) == NULL) { \ err_exit(_("%s: missing field on line %d"), \ filename, lineno); \ } \ - if (strlen(unscramble(crypt_key, buf, BUFSIZE)) == 0) { \ + if (strlen(unscramble(&crypt_key, bigbuf, BIGBUFSIZE, \ + buf, BUFSIZE)) == 0) { \ err_exit(_("%s: illegal value on line %d"), \ filename, lineno); \ } \ @@ -157,8 +160,8 @@ static const unsigned char game_file_crypt_key[] = { #define save_game_printf(_fmt, _var) \ do { \ snprintf(buf, BUFSIZE, _fmt "\n", _var); \ - scramble(crypt_key, buf, BUFSIZE); \ - fprintf(file, "%s", buf); \ + scramble(&crypt_key, buf, BUFSIZE, bigbuf, BIGBUFSIZE); \ + fprintf(file, "%s", bigbuf); \ } while (0) #define save_game_write_int(_var) \ @@ -224,10 +227,11 @@ bool load_game (int num) int saved_errno, lineno; char *prev_locale; - char *buf; + char *buf, *bigbuf; wchar_t *wcbuf; - int crypt_key; + unsigned char crypt_key; + int crypt_key_input; int n, i, j; #ifdef USE_UTF8_GAME_FILE @@ -239,6 +243,7 @@ bool load_game (int num) assert(num >= 1 && num <= 9); buf = xmalloc(BUFSIZE); + bigbuf = xmalloc(BIGBUFSIZE); wcbuf = xmalloc(BUFSIZE * sizeof(wchar_t)); filename = game_filename(num); @@ -267,6 +272,7 @@ bool load_game (int num) } free(buf); + free(bigbuf); free(wcbuf); free(filename); return false; @@ -336,9 +342,10 @@ bool load_game (int num) lineno = 4; // Read in the game file encryption key - if (fscanf(file, "%i\n", &crypt_key) != 1) { + if (fscanf(file, "%i\n", &crypt_key_input) != 1) { err_exit(_("%s: illegal or missing field on line %d"), filename, lineno); } + crypt_key = (unsigned char) crypt_key_input; lineno++; // Read in various game variables @@ -377,10 +384,11 @@ bool load_game (int num) // Read in galaxy map for (int x = 0; x < MAX_X; x++) { - if (fgets(buf, BUFSIZE, file) == NULL) { + if (fgets(bigbuf, BIGBUFSIZE, file) == NULL) { err_exit(_("%s: missing field on line %d"), filename, lineno); } - if (strlen(unscramble(crypt_key, buf, BUFSIZE)) != MAX_Y + 1) { + if (strlen(unscramble(&crypt_key, bigbuf, BIGBUFSIZE, buf, BUFSIZE)) + != MAX_Y + 1) { err_exit(_("%s: illegal field on line %d"), filename, lineno); } @@ -414,6 +422,7 @@ bool load_game (int num) #endif free(buf); + free(bigbuf); free(wcbuf); free(filename); free(prev_locale); @@ -428,13 +437,14 @@ bool load_game (int num) bool save_game (int num) { const char *data_dir; - char *buf, *filename; + char *buf, *bigbuf; + char *filename; FILE *file; char *codeset; int saved_errno; char *prev_locale; struct stat statbuf; - int crypt_key; + unsigned char crypt_key; int i, j, x, y; #ifdef USE_UTF8_GAME_FILE @@ -446,6 +456,7 @@ bool save_game (int num) assert(num >= 1 && num <= 9); buf = xmalloc(BUFSIZE); + bigbuf = xmalloc(BIGBUFSIZE); crypt_key = option_dont_encrypt ? 0 : game_file_crypt_key[randi(GAME_FILE_CRYPT_KEY_SIZE)]; @@ -469,6 +480,7 @@ bool save_game (int num) strerror(saved_errno)); free(buf); + free(bigbuf); return false; } } @@ -489,6 +501,7 @@ bool save_game (int num) "^{File %s: %s^}"), num, filename, strerror(saved_errno)); free(buf); + free(bigbuf); free(filename); return false; } @@ -568,8 +581,8 @@ bool save_game (int num) *p++ = '\n'; *p = '\0'; - scramble(crypt_key, buf, BUFSIZE); - fprintf(file, "%s", buf); + scramble(&crypt_key, buf, BUFSIZE, bigbuf, BIGBUFSIZE); + fprintf(file, "%s", bigbuf); } // Write out a dummy sentinal value @@ -589,6 +602,7 @@ bool save_game (int num) #endif free(buf); + free(bigbuf); free(filename); free(prev_locale); return true; diff --git a/src/trader.h b/src/trader.h index 47bfe78..b2cf709 100644 --- a/src/trader.h +++ b/src/trader.h @@ -62,7 +62,7 @@ #endif #define BUFSIZE 1024 // For various string buffers -#define BIGBUFSIZE 2048 // For buffers known to be larger +#define BIGBUFSIZE 4096 // For buffers known to be larger #endif /* included_TRADER_H */ diff --git a/src/utils.c b/src/utils.c index 2a0f779..958aae9 100644 --- a/src/utils.c +++ b/src/utils.c @@ -62,6 +62,27 @@ wchar_t *mon_thousands_sep; // Local monetary thousands separator #define MOD_POSIX_P_CS_PRECEDES 1 #define MOD_POSIX_P_SEP_BY_SPACE 0 +// Constants used for scrambling and unscrambling game data +#define SCRAMBLE_PAD_CHAR '.' +#define UNSCRAMBLE_INVALID (-1) +#define UNSCRAMBLE_PAD_CHAR (-2) + +static const char scramble_index[] = + "0123456789AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz-_"; + +static const char unscramble_index[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -2, -1, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, + -1, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, + 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, -1, -1, -1, -1, 63, + -1, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, + 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, -1, -1, -1, -1, -1 +}; + +#define UNSCRAMBLE_INDEX_SIZE (sizeof(unscramble_index) / sizeof(unscramble_index[0])) + /************************************************************************ * Module-specific variables * @@ -421,7 +442,9 @@ ssize_t l_strfmon (char *restrict buf, size_t maxsize, /***********************************************************************/ // scramble: Scramble (encrypt) the buffer -char *scramble (int key, char *restrict buf, int bufsize) +char *scramble (unsigned char *restrict key, + char *restrict inbuf, int inbufsize, + char *restrict outbuf, int outbufsize) { /* The algorithm used here is reversable: scramble(scramble(...)) will (or, at least, should!) return the same as the original @@ -429,11 +452,13 @@ char *scramble (int key, char *restrict buf, int bufsize) function assumes all other characters are permitted in files. This is true on all POSIX systems. */ - if (buf != NULL && key != 0) { - char *p = buf; - unsigned char k = ~key; + assert(outbuf != NULL); - for (int i = 0; i < bufsize && *p != '\0'; i++, k++, p++) { + if (inbuf != NULL && key != NULL && *key != 0) { + char *p = inbuf; + unsigned char k = ~*key; + + for (int i = 0; i < inbufsize && *p != '\0'; i++, k++, p++) { char c = *p; char r = c ^ k; // Simple encryption: XOR on a moving key @@ -444,16 +469,20 @@ char *scramble (int key, char *restrict buf, int bufsize) } } - return buf; + strcpy(outbuf, inbuf); + + return outbuf; } /***********************************************************************/ // unscramble: Unscramble (decrypt) the buffer -char *unscramble (int key, char *restrict buf, int bufsize) +char *unscramble (unsigned char *restrict key, + char *restrict inbuf, int inbufsize, + char *restrict outbuf, int outbufsize) { - return scramble(key, buf, bufsize); + return scramble(key, inbuf, inbufsize, outbuf, outbufsize); } diff --git a/src/utils.h b/src/utils.h index b23254f..6ca4686 100644 --- a/src/utils.h +++ b/src/utils.h @@ -265,41 +265,54 @@ extern ssize_t l_strfmon (char *restrict buf, size_t maxsize, */ /* - Function: scramble - Scramble (encrypt) the buffer - Parameters: key - Encryption key - buf - Pointer to buffer to encrypt - bufsize - Size of buffer - Returns: char * - Pointer to buffer + Function: scramble - Scramble (encrypt) the buffer + Parameters: key - Pointer to encryption/decryption key + inbuf - Pointer to input buffer to encrypt + inbufsize - Size of input buffer + outbuf - Pointer to output buffer + outbufsize - Size of output buffer + Returns: char * - Pointer to output buffer - This function scrambles (encrypts) the buffer *buf using a trivial - in-place encryption algorithm. If key is zero, or buf is NULL or - bufsize is less than 1, no encryption takes place. + This function scrambles (encrypts) the buffer *inbuf using a trivial + encryption algorithm and places the result in *outbuf. If key is NULL + or *key is zero, no encryption takes place: the input buffer is copied + to the output buffer as-is. - The buffer should contain a C-style string terminated by '\0'. The - characters '\r', '\n' and '\0' are guaranteed to remain the same before - and after encryption. At most bufsize bytes are encrypted; buf is - returned as the result. + The input buffer should contain a C-style string terminated by '\0'. + The characters '\r', '\n' and '\0' are guaranteed to remain the same + before and after encryption. Note that inbuf and outbuf MUST point to + different buffers, and that outbuf typically must be four times larger + than inbuf. At most inbufsize bytes are encrypted; outbuf is returned + as the result. */ -extern char *scramble (int key, char *restrict buf, int bufsize); +extern char *scramble (unsigned char *restrict key, + char *restrict inbuf, int inbufsize, + char *restrict outbuf, int outbufsize); /* Function: unscramble - Unscramble (decrypt) the buffer - Parameters: key - Encryption/decryption key - buf - Pointer to buffer to decrypt - bufsize - Size of buffer - Returns: char * - Pointer to buffer + Parameters: key - Pointer to encryption/decryption key + inbuf - Pointer to input buffer to decrypt + inbufsize - Size of input buffer + outbuf - Pointer to output buffer + outbufsize - Size of output buffer + Returns: char * - Pointer to output buffer This function does the reverse of scramble(): it unscrambles (decrypts) - the buffer *buf using an in-place algorithm. If key is zero, or buf is - NULL or bufsize is less than 1, no decryption takes place. + the buffer *inbuf using a trivial algorithm and places the result in + *outbuf. If key is NULL or *key is zero, no decryption takes place: + the input buffer is copied to the output buffer as-is. The buffer should contain a C-style string terminated by '\0'. As for scramble(), the characters '\r', '\n' and '\0' will not be changed (nor - will any encrypted character map back to these values). At most - bufsize bytes are decrypted; buf is returned as the result. + will any encrypted character map back to these values). Note that + inbuf and outbuf MUST point to different buffers. At most bufsize + bytes are decrypted; outbuf is returned as the result. */ -extern char *unscramble (int key, char *restrict buf, int bufsize); +extern char *unscramble (unsigned char *restrict key, + char *restrict inbuf, int inbufsize, + char *restrict outbuf, int outbufsize); /************************************************************************ From 3d20e0b307f510a3b96441f1de63c3db3f013fc8 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 22 May 2014 18:17:02 +1000 Subject: [PATCH 29/39] Add the CRC32 functions from the GNU Portability Library --- lib/.gitignore | 2 ++ m4/gnulib-cache.m4 | 3 ++- src/system.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/.gitignore b/lib/.gitignore index 1964617..1dfe1fc 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -6,6 +6,8 @@ c-strcase.h c-strcasecmp.c c-strncasecmp.c config.charset +crc.c +crc.h getopt.c getopt.in.h getopt1.c diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index bcd448d..1329544 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -27,7 +27,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h getopt-gnu gettext gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h +# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) @@ -35,6 +35,7 @@ gl_MODULES([ assert btowc config-h + crc getopt-gnu gettext gettext-h diff --git a/src/system.h b/src/system.h index 104cc3a..a936cc4 100644 --- a/src/system.h +++ b/src/system.h @@ -75,6 +75,7 @@ // Headers defined by the GNU C Library +#include #include From 9cb3a46693f361633d3fbd773cb42b00d3d206ff Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 23 May 2014 18:56:24 +1000 Subject: [PATCH 30/39] Completely rewrite the scramble() and unscramble() functions The file output is now completely in ASCII---and will be much harder to break for casual cheating! --- src/fileio.c | 100 +++++----- src/trader.h | 4 +- src/utils.c | 525 ++++++++++++++++++++++++++++++++++++++++++++++----- src/utils.h | 75 ++++---- 4 files changed, 573 insertions(+), 131 deletions(-) diff --git a/src/fileio.c b/src/fileio.c index 335e03d..d636b3b 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -32,32 +32,22 @@ /************************************************************************ -* Module-specific constants and macros * +* Module-specific macros * ************************************************************************/ -// Game loading and saving constants - -static const unsigned char game_file_crypt_key[] = { - 0x50, 0x52, 0x55, 0x59, 0x5A, 0x5C, 0x5F, - 0x90, 0x92, 0x95, 0x99, 0x9A, 0x9C, 0x9F, - 0xA0, 0xA2, 0xA5, 0xA9, 0xAA, 0xAC, 0xAF, - 0xD0, 0xD2, 0xD5, 0xD9, 0xDA, 0xDC, 0xDF -}; - -#define GAME_FILE_CRYPT_KEY_SIZE (sizeof(game_file_crypt_key) / sizeof(game_file_crypt_key[0])) - - // Macros used in load_game() #define load_game_scanf(_fmt, _var, _cond) \ do { \ - if (fgets(bigbuf, BIGBUFSIZE, file) == NULL) { \ + if (fgets(inbuf, BIGBUFSIZE, file) == NULL) { \ err_exit(_("%s: missing field on line %d"), \ filename, lineno); \ } \ - if (sscanf(unscramble(&crypt_key, bigbuf, BIGBUFSIZE, \ - buf, BUFSIZE), _fmt "\n", &(_var)) \ - != 1) { \ + if (unscramble(buf, inbuf, BUFSIZE, crypt_key_p) == NULL) { \ + err_exit(_("%s: illegal field on line %d"), \ + filename, lineno); \ + } \ + if (sscanf(buf, _fmt "\n", &(_var)) != 1) { \ err_exit(_("%s: illegal field on line %d: `%s'"), \ filename, lineno, buf); \ } \ @@ -89,12 +79,15 @@ static const unsigned char game_file_crypt_key[] = { char *s; \ int len; \ \ - if (fgets(bigbuf, BIGBUFSIZE, file) == NULL) { \ + if (fgets(inbuf, BIGBUFSIZE, file) == NULL) { \ err_exit(_("%s: missing field on line %d"), \ filename, lineno); \ } \ - if (strlen(unscramble(&crypt_key, bigbuf, BIGBUFSIZE, \ - buf, BUFSIZE)) == 0) { \ + if (unscramble(buf, inbuf, BUFSIZE, crypt_key_p) == NULL) { \ + err_exit(_("%s: illegal field on line %d"), \ + filename, lineno); \ + } \ + if (strlen(buf) == 0) { \ err_exit(_("%s: illegal value on line %d"), \ filename, lineno); \ } \ @@ -129,12 +122,15 @@ static const unsigned char game_file_crypt_key[] = { char *s; \ int len; \ \ - if (fgets(bigbuf, BIGBUFSIZE, file) == NULL) { \ + if (fgets(inbuf, BIGBUFSIZE, file) == NULL) { \ err_exit(_("%s: missing field on line %d"), \ filename, lineno); \ } \ - if (strlen(unscramble(&crypt_key, bigbuf, BIGBUFSIZE, \ - buf, BUFSIZE)) == 0) { \ + if (unscramble(buf, inbuf, BUFSIZE, crypt_key_p) == NULL) { \ + err_exit(_("%s: illegal field on line %d"), \ + filename, lineno); \ + } \ + if (strlen(buf) == 0) { \ err_exit(_("%s: illegal value on line %d"), \ filename, lineno); \ } \ @@ -160,8 +156,8 @@ static const unsigned char game_file_crypt_key[] = { #define save_game_printf(_fmt, _var) \ do { \ snprintf(buf, BUFSIZE, _fmt "\n", _var); \ - scramble(&crypt_key, buf, BUFSIZE, bigbuf, BIGBUFSIZE); \ - fprintf(file, "%s", bigbuf); \ + scramble(encbuf, buf, BIGBUFSIZE, crypt_key_p); \ + fprintf(file, "%s", encbuf); \ } while (0) #define save_game_write_int(_var) \ @@ -227,11 +223,12 @@ bool load_game (int num) int saved_errno, lineno; char *prev_locale; - char *buf, *bigbuf; + char *buf, *inbuf; wchar_t *wcbuf; - unsigned char crypt_key; - int crypt_key_input; + unsigned int crypt_key; + unsigned int *crypt_key_p; + int is_encrypted_input; int n, i, j; #ifdef USE_UTF8_GAME_FILE @@ -243,7 +240,7 @@ bool load_game (int num) assert(num >= 1 && num <= 9); buf = xmalloc(BUFSIZE); - bigbuf = xmalloc(BIGBUFSIZE); + inbuf = xmalloc(BIGBUFSIZE); wcbuf = xmalloc(BUFSIZE * sizeof(wchar_t)); filename = game_filename(num); @@ -272,7 +269,7 @@ bool load_game (int num) } free(buf); - free(bigbuf); + free(inbuf); free(wcbuf); free(filename); return false; @@ -341,13 +338,15 @@ bool load_game (int num) lineno = 4; - // Read in the game file encryption key - if (fscanf(file, "%i\n", &crypt_key_input) != 1) { + // Read in the game file encryption status + if (fscanf(file, "%i\n", &is_encrypted_input) != 1) { err_exit(_("%s: illegal or missing field on line %d"), filename, lineno); } - crypt_key = (unsigned char) crypt_key_input; lineno++; + crypt_key = 0; + crypt_key_p = is_encrypted_input ? &crypt_key : NULL; + // Read in various game variables load_game_read_int(n, n == MAX_X); load_game_read_int(n, n == MAX_Y); @@ -384,11 +383,13 @@ bool load_game (int num) // Read in galaxy map for (int x = 0; x < MAX_X; x++) { - if (fgets(bigbuf, BIGBUFSIZE, file) == NULL) { + if (fgets(inbuf, BIGBUFSIZE, file) == NULL) { err_exit(_("%s: missing field on line %d"), filename, lineno); } - if (strlen(unscramble(&crypt_key, bigbuf, BIGBUFSIZE, buf, BUFSIZE)) - != MAX_Y + 1) { + if (unscramble(buf, inbuf, BUFSIZE, crypt_key_p) == NULL) { + err_exit(_("%s: illegal field on line %d"), filename, lineno); + } + if (strlen(buf) != MAX_Y + 1) { err_exit(_("%s: illegal field on line %d"), filename, lineno); } @@ -422,7 +423,7 @@ bool load_game (int num) #endif free(buf); - free(bigbuf); + free(inbuf); free(wcbuf); free(filename); free(prev_locale); @@ -437,15 +438,16 @@ bool load_game (int num) bool save_game (int num) { const char *data_dir; - char *buf, *bigbuf; + char *buf, *encbuf; char *filename; FILE *file; char *codeset; int saved_errno; char *prev_locale; struct stat statbuf; - unsigned char crypt_key; int i, j, x, y; + unsigned int crypt_key; + unsigned int *crypt_key_p; #ifdef USE_UTF8_GAME_FILE iconv_t icd; @@ -456,10 +458,10 @@ bool save_game (int num) assert(num >= 1 && num <= 9); buf = xmalloc(BUFSIZE); - bigbuf = xmalloc(BIGBUFSIZE); + encbuf = xmalloc(BIGBUFSIZE); - crypt_key = option_dont_encrypt ? 0 : - game_file_crypt_key[randi(GAME_FILE_CRYPT_KEY_SIZE)]; + crypt_key = 0; + crypt_key_p = option_dont_encrypt ? NULL : &crypt_key; // Create the data directory, if needed data_dir = data_directory(); @@ -480,7 +482,7 @@ bool save_game (int num) strerror(saved_errno)); free(buf); - free(bigbuf); + free(encbuf); return false; } } @@ -501,7 +503,7 @@ bool save_game (int num) "^{File %s: %s^}"), num, filename, strerror(saved_errno)); free(buf); - free(bigbuf); + free(encbuf); free(filename); return false; } @@ -534,9 +536,9 @@ bool save_game (int num) prev_locale = xstrdup(setlocale(LC_NUMERIC, NULL)); setlocale(LC_NUMERIC, "C"); - // Write out the game file header and encryption key + // Write out the game file header and encryption status fprintf(file, "%s\n" "%s\n", GAME_FILE_HEADER, GAME_FILE_API_VERSION); - fprintf(file, "%s\n" "%d\n", codeset, crypt_key); + fprintf(file, "%s\n" "%d\n", codeset, ! option_dont_encrypt); // Write out various game variables save_game_write_int(MAX_X); @@ -581,8 +583,8 @@ bool save_game (int num) *p++ = '\n'; *p = '\0'; - scramble(&crypt_key, buf, BUFSIZE, bigbuf, BIGBUFSIZE); - fprintf(file, "%s", bigbuf); + scramble(encbuf, buf, BIGBUFSIZE, crypt_key_p); + fprintf(file, "%s", encbuf); } // Write out a dummy sentinal value @@ -602,7 +604,7 @@ bool save_game (int num) #endif free(buf); - free(bigbuf); + free(encbuf); free(filename); free(prev_locale); return true; diff --git a/src/trader.h b/src/trader.h index b2cf709..32f8385 100644 --- a/src/trader.h +++ b/src/trader.h @@ -53,7 +53,7 @@ ************************************************************************/ #define GAME_FILE_HEADER "Star Traders Saved Game" -#define GAME_FILE_API_VERSION "File API 7.2" // For game loads and saves +#define GAME_FILE_API_VERSION "File API 7.5" // For game loads and saves #define GAME_FILE_SENTINEL 42 // End of game file sentinel #ifdef USE_UTF8_GAME_FILE @@ -62,7 +62,7 @@ #endif #define BUFSIZE 1024 // For various string buffers -#define BIGBUFSIZE 4096 // For buffers known to be larger +#define BIGBUFSIZE 2048 // For buffers known to be larger #endif /* included_TRADER_H */ diff --git a/src/utils.c b/src/utils.c index 958aae9..d4681be 100644 --- a/src/utils.c +++ b/src/utils.c @@ -50,7 +50,7 @@ wchar_t *mon_thousands_sep; // Local monetary thousands separator /************************************************************************ -* Module-specific constants and variable definitions * +* Module-specific constants and macros * ************************************************************************/ #define GAME_FILENAME_PROTO "game%d" @@ -63,25 +63,120 @@ wchar_t *mon_thousands_sep; // Local monetary thousands separator #define MOD_POSIX_P_SEP_BY_SPACE 0 // Constants used for scrambling and unscrambling game data -#define SCRAMBLE_PAD_CHAR '.' -#define UNSCRAMBLE_INVALID (-1) -#define UNSCRAMBLE_PAD_CHAR (-2) +#define SCRAMBLE_CRC_LEN 8 // Length of CRC in ASCII (excl NUL) +#define SCRAMBLE_CHKSUM_LEN 3 // For checksum, excluding NUL byte +#define SCRAMBLE_CRC_MASK 0xFFFFFFFF // Bits of CRC to keep +#define SCRAMBLE_CHKSUM_MASK 0x0FFF // Bits of checksum to keep -static const char scramble_index[] = +#define SCRAMBLE_PAD_CHAR '*' +#define SCRAMBLE_IGNORE_CHAR '~' +#define UNSCRAMBLE_INVALID (-1) +#define UNSCRAMBLE_IGNORE (-2) +#define UNSCRAMBLE_PAD_CHAR (-3) + +static const char scramble_table[] = "0123456789AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz-_"; -static const char unscramble_index[] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -2, -1, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, - -1, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, - 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, -1, -1, -1, -1, 63, - -1, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, - 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, -1, -1, -1, -1, -1 +#define _b(n) \ + ((n) == '0' ? 0 : (n) == '1' ? 1 : (n) == '2' ? 2 : (n) == '3' ? 3 : \ + (n) == '4' ? 4 : (n) == '5' ? 5 : (n) == '6' ? 6 : (n) == '7' ? 7 : \ + (n) == '8' ? 8 : (n) == '9' ? 9 : (n) == 'A' ? 10 : (n) == 'a' ? 11 : \ + (n) == 'B' ? 12 : (n) == 'b' ? 13 : (n) == 'C' ? 14 : (n) == 'c' ? 15 : \ + (n) == 'D' ? 16 : (n) == 'd' ? 17 : (n) == 'E' ? 18 : (n) == 'e' ? 19 : \ + (n) == 'F' ? 20 : (n) == 'f' ? 21 : (n) == 'G' ? 22 : (n) == 'g' ? 23 : \ + (n) == 'H' ? 24 : (n) == 'h' ? 25 : (n) == 'I' ? 26 : (n) == 'i' ? 27 : \ + (n) == 'J' ? 28 : (n) == 'j' ? 29 : (n) == 'K' ? 30 : (n) == 'k' ? 31 : \ + (n) == 'L' ? 32 : (n) == 'l' ? 33 : (n) == 'M' ? 34 : (n) == 'm' ? 35 : \ + (n) == 'N' ? 36 : (n) == 'n' ? 37 : (n) == 'O' ? 38 : (n) == 'o' ? 39 : \ + (n) == 'P' ? 40 : (n) == 'p' ? 41 : (n) == 'Q' ? 42 : (n) == 'q' ? 43 : \ + (n) == 'R' ? 44 : (n) == 'r' ? 45 : (n) == 'S' ? 46 : (n) == 's' ? 47 : \ + (n) == 'T' ? 48 : (n) == 't' ? 49 : (n) == 'U' ? 50 : (n) == 'u' ? 51 : \ + (n) == 'V' ? 52 : (n) == 'v' ? 53 : (n) == 'W' ? 54 : (n) == 'w' ? 55 : \ + (n) == 'X' ? 56 : (n) == 'x' ? 57 : (n) == 'Y' ? 58 : (n) == 'y' ? 59 : \ + (n) == 'Z' ? 60 : (n) == 'z' ? 61 : (n) == '-' ? 62 : (n) == '_' ? 63 : \ + (n) == ' ' ? UNSCRAMBLE_IGNORE : \ + (n) == '\t' ? UNSCRAMBLE_IGNORE : \ + (n) == '\n' ? UNSCRAMBLE_IGNORE : \ + (n) == '\r' ? UNSCRAMBLE_IGNORE : \ + (n) == SCRAMBLE_IGNORE_CHAR ? UNSCRAMBLE_IGNORE : \ + (n) == SCRAMBLE_PAD_CHAR ? UNSCRAMBLE_PAD_CHAR : \ + UNSCRAMBLE_INVALID) + +static const signed char unscramble_table[] = { + _b(0), _b(1), _b(2), _b(3), _b(4), _b(5), _b(6), _b(7), + _b(8), _b(9), _b(10) , _b(11), _b(12), _b(13), _b(14), _b(15), + _b(16), _b(17), _b(18), _b(19), _b(20), _b(21), _b(22), _b(23), + _b(24), _b(25), _b(26), _b(27), _b(28), _b(29), _b(30), _b(31), + _b(32), _b(33), _b(34), _b(35), _b(36), _b(37), _b(38), _b(39), + _b(40), _b(41), _b(42), _b(43), _b(44), _b(45), _b(46), _b(47), + _b(48), _b(49), _b(50), _b(51), _b(52), _b(53), _b(54), _b(55), + _b(56), _b(57), _b(58), _b(59), _b(60), _b(61), _b(62), _b(63), + _b(64), _b(65), _b(66), _b(67), _b(68), _b(69), _b(70), _b(71), + _b(72), _b(73), _b(74), _b(75), _b(76), _b(77), _b(78), _b(79), + _b(80), _b(81), _b(82), _b(83), _b(84), _b(85), _b(86), _b(87), + _b(88), _b(89), _b(90), _b(91), _b(92), _b(93), _b(94), _b(95), + _b(96), _b(97), _b(98), _b(99), _b(100), _b(101), _b(102), _b(103), + _b(104), _b(105), _b(106), _b(107), _b(108), _b(109), _b(110), _b(111), + _b(112), _b(113), _b(114), _b(115), _b(116), _b(117), _b(118), _b(119), + _b(120), _b(121), _b(122), _b(123), _b(124), _b(125), _b(126), _b(127), + _b(128), _b(129), _b(130), _b(131), _b(132), _b(133), _b(134), _b(135), + _b(136), _b(137), _b(138), _b(139), _b(140), _b(141), _b(142), _b(143), + _b(144), _b(145), _b(146), _b(147), _b(148), _b(149), _b(150), _b(151), + _b(152), _b(153), _b(154), _b(155), _b(156), _b(157), _b(158), _b(159), + _b(160), _b(161), _b(162), _b(163), _b(164), _b(165), _b(166), _b(167), + _b(168), _b(169), _b(170), _b(171), _b(172), _b(173), _b(174), _b(175), + _b(176), _b(177), _b(178), _b(179), _b(180), _b(181), _b(182), _b(183), + _b(184), _b(185), _b(186), _b(187), _b(188), _b(189), _b(190), _b(191), + _b(192), _b(193), _b(194), _b(195), _b(196), _b(197), _b(198), _b(199), + _b(200), _b(201), _b(202), _b(203), _b(204), _b(205), _b(206), _b(207), + _b(208), _b(209), _b(210), _b(211), _b(212), _b(213), _b(214), _b(215), + _b(216), _b(217), _b(218), _b(219), _b(220), _b(221), _b(222), _b(223), + _b(224), _b(225), _b(226), _b(227), _b(228), _b(229), _b(230), _b(231), + _b(232), _b(233), _b(234), _b(235), _b(236), _b(237), _b(238), _b(239), + _b(240), _b(241), _b(242), _b(243), _b(244), _b(245), _b(246), _b(247), + _b(248), _b(249), _b(250), _b(251), _b(252), _b(253), _b(254), _b(255) }; -#define UNSCRAMBLE_INDEX_SIZE (sizeof(unscramble_index) / sizeof(unscramble_index[0])) +#define UNSCRAMBLE_TABLE_SIZE (sizeof(unscramble_table) / sizeof(unscramble_table[0])) + +static const unsigned char xor_table[] = { + /* Set of bytes 0x00 to 0xFF in random order; each byte in an input + string is XORed with successive bytes in this table. */ + 0x00, 0xCE, 0xB1, 0x9F, 0xE4, 0xE0, 0xE3, 0x79, + 0xA1, 0x3B, 0x4E, 0x89, 0x81, 0x84, 0x43, 0xC8, + 0xBE, 0x0F, 0x67, 0x2A, 0xB4, 0xD8, 0xBA, 0x5D, + 0x94, 0x06, 0x69, 0x0E, 0x1C, 0x48, 0x9E, 0x0A, + 0x1D, 0x09, 0x02, 0xCD, 0xD4, 0xF6, 0x5B, 0x8A, + 0xAE, 0x65, 0xB3, 0xB5, 0xA7, 0x13, 0x03, 0xF2, + 0x42, 0xF0, 0xA6, 0xAA, 0x35, 0xCB, 0x2C, 0x55, + 0xF5, 0xC7, 0x32, 0xB7, 0x6B, 0xEA, 0xC3, 0x6F, + 0x41, 0xFF, 0xD1, 0x24, 0x54, 0xA9, 0xC6, 0xC2, + 0x74, 0xEE, 0xBC, 0x99, 0x59, 0x71, 0x3D, 0x85, + 0x0B, 0xF7, 0x3A, 0x7E, 0xDB, 0x45, 0xE8, 0x96, + 0xD0, 0xC1, 0xE6, 0xFD, 0x86, 0x8C, 0x9B, 0x0C, + 0x66, 0x5F, 0xE5, 0x14, 0x98, 0x3C, 0xBD, 0xE2, + 0x88, 0xA3, 0x30, 0x38, 0x2F, 0xA2, 0x37, 0x70, + 0xB8, 0x11, 0x61, 0x93, 0x52, 0x1B, 0xDD, 0x20, + 0x60, 0x19, 0xEF, 0xD2, 0xEC, 0x73, 0x07, 0x92, + 0x4C, 0x6A, 0xA8, 0x9D, 0x34, 0x04, 0x87, 0x2E, + 0x1E, 0xA4, 0xCA, 0x72, 0x63, 0xD7, 0x7F, 0xFB, + 0x68, 0xE1, 0xBF, 0x10, 0x8E, 0xAF, 0x9A, 0xFA, + 0xA0, 0xDE, 0x1F, 0x31, 0x15, 0x97, 0xED, 0x2B, + 0x36, 0x8D, 0x12, 0xC5, 0x23, 0x95, 0x33, 0x56, + 0x4F, 0xE7, 0xAD, 0x5C, 0x4B, 0x83, 0xDC, 0x29, + 0xE9, 0xCF, 0x8F, 0x58, 0x4D, 0x5A, 0x08, 0x49, + 0xFC, 0x6D, 0x7C, 0xB6, 0xD3, 0x7B, 0xD6, 0x53, + 0x57, 0x82, 0x0D, 0xD9, 0x7D, 0xDA, 0x4A, 0xDF, + 0x27, 0x40, 0x1A, 0x22, 0xC9, 0x51, 0x3E, 0x6C, + 0xC4, 0x18, 0xCC, 0xAC, 0xEB, 0xA5, 0xF4, 0x44, + 0xFE, 0x76, 0xF8, 0x75, 0xF3, 0x2D, 0xB0, 0xB9, + 0x9C, 0x47, 0x7A, 0x28, 0xBB, 0xF1, 0x16, 0x64, + 0x46, 0x21, 0x78, 0x90, 0xD5, 0x80, 0x3F, 0x39, + 0x25, 0xB2, 0x6E, 0x8B, 0x77, 0xC0, 0x05, 0x50, + 0x17, 0xF9, 0x01, 0x26, 0x91, 0x5E, 0x62, 0xAB +}; + +#define XOR_TABLE_SIZE (sizeof(xor_table) / sizeof(xor_table[0])) /************************************************************************ @@ -94,6 +189,69 @@ static char *data_directory_str = NULL; // Writable data dir pathname static bool add_currency_symbol = false; // Do we need to add "$"? +/************************************************************************ +* Module-specific function prototypes * +************************************************************************/ + +/* + Function: apply_xor - Scramble a buffer using xor_table + Parameters: dest - Location of destination buffer + src - Location of source buffer + n - Number of bytes to scramble + key - Pointer to xor_table index + Returns: (nothing) + + This function copies n bytes from *src into *dest, applying a XOR with + the contents of xor_table in the process. It is a reversable function: + apply_xor(apply_xor(buffer)) == buffer. It is used by both scramble() + and unscramble(). +*/ +static void apply_xor (void *restrict dest, const void *restrict src, + size_t n, unsigned int *restrict key); + + +/* + Function: b64encode - Convert a block to non-standard Base64 encoding + Parameters: in - Location of input buffer + inlen - Size of input buffer + out - Location of output buffer + outlen - Size of output buffer + Returns: size_t - Number of bytes placed in output buffer + + This function encodes inlen bytes in the input buffer into the output + buffer using a non-standard Base64 encoding (as contained above in + scramble_table[]). The resulting encoded string length is returned + (including trailing '\n' but NOT including trailing NUL). + + Note that the output buffer must be at least 4/3 the size of the input + buffer; if not, an assert is generated. + + This function is used by scramble(). +*/ +static size_t b64encode (const void *restrict in, size_t inlen, + void *restrict out, size_t outlen); + + +/* + Function: b64decode - Convert a block from non-standard Base64 encoding + Parameters: in - Location of input buffer + inlen - Size of input buffer + out - Location of output buffer + outlen - Size of output buffer + Returns: ssize_t - Number of bytes placed in output buffer, or -1 + + This function decodes up to inlen bytes in the input buffer into the + output buffer using a non-standard Base64 encoding (as contained above + in unscramble_table[]). The resulting decoded buffer length is + returned; that buffer may contain NUL bytes. If an error occurs during + decoding, -1 is returned instead. + + This function is used by unscramble(). +*/ +static ssize_t b64decode (const void *restrict in, size_t inlen, + void *restrict out, size_t outlen); + + /************************************************************************ * Initialisation and environment function definitions * ************************************************************************/ @@ -436,53 +594,336 @@ ssize_t l_strfmon (char *restrict buf, size_t maxsize, * Encryption function definitions * ************************************************************************/ -// These functions are documented in the file "utils.h" +/* These functions are documented in the file "utils.h" or in the + comments above. */ /***********************************************************************/ // scramble: Scramble (encrypt) the buffer -char *scramble (unsigned char *restrict key, - char *restrict inbuf, int inbufsize, - char *restrict outbuf, int outbufsize) +char *scramble (char *restrict dest, const char *restrict src, + size_t size, unsigned int *restrict key) { - /* The algorithm used here is reversable: scramble(scramble(...)) - will (or, at least, should!) return the same as the original - buffer. Problematic characters are ignored; however, this - function assumes all other characters are permitted in files. - This is true on all POSIX systems. */ + unsigned long int crc; + unsigned int chksum; + size_t srclen; + char *xorbuf, *midxor; + char *middest; + char crcbuf[SCRAMBLE_CRC_LEN + 1]; + char chksumbuf[SCRAMBLE_CHKSUM_LEN + 1]; - assert(outbuf != NULL); - if (inbuf != NULL && key != NULL && *key != 0) { - char *p = inbuf; - unsigned char k = ~*key; + assert(dest != NULL); + assert(src != NULL); + assert(size > 0); - for (int i = 0; i < inbufsize && *p != '\0'; i++, k++, p++) { - char c = *p; - char r = c ^ k; // Simple encryption: XOR on a moving key + srclen = strlen(src); - if (c != '\r' && c != '\n' - && r != '\r' && r != '\n' && r != '\0') { - *p = r; - } + if (key == NULL) { + // No encryption required + assert(size >= srclen + 2); // Enough room to add "\n"? + + strcpy(dest, src); + + // Add "\n" if needed + if (dest[srclen - 1] != '\n') { + dest[srclen] = '\n'; + dest[srclen + 1] = '\0'; } + } else { + // Scramble the input + + xorbuf = xmalloc(srclen + SCRAMBLE_CRC_LEN + 1); + + // Scramble src using *key, leaving room for CRC32 in front + midxor = xorbuf + SCRAMBLE_CRC_LEN; + apply_xor(midxor, src, srclen, key); + + // Calculate CRC32 checksum of XORed buffer + crc = crc32(midxor, srclen) & SCRAMBLE_CRC_MASK; + snprintf(crcbuf, SCRAMBLE_CRC_LEN + 1, "%08lx", crc); + memcpy(xorbuf, crcbuf, SCRAMBLE_CRC_LEN); + + // Encode whole buffer (including CRC32) using Base64 + middest = dest + SCRAMBLE_CHKSUM_LEN; + b64encode(xorbuf, srclen + SCRAMBLE_CRC_LEN, + middest, size - SCRAMBLE_CHKSUM_LEN); + + // Calculate simple checksum + chksum = 0; + for (char *p = middest; *p != '\0' && *p != '\n'; p++) { + chksum += *p; + } + chksum &= SCRAMBLE_CHKSUM_MASK; + + // Place checksum in front of Base64 string + snprintf(chksumbuf, SCRAMBLE_CHKSUM_LEN + 1, "%03x", chksum); + memcpy(dest, chksumbuf, SCRAMBLE_CHKSUM_LEN); + + free(xorbuf); } - strcpy(outbuf, inbuf); - - return outbuf; + return dest; } /***********************************************************************/ // unscramble: Unscramble (decrypt) the buffer -char *unscramble (unsigned char *restrict key, - char *restrict inbuf, int inbufsize, - char *restrict outbuf, int outbufsize) +char *unscramble (char *restrict dest, const char *restrict src, + size_t size, unsigned int *restrict key) { - return scramble(key, inbuf, inbufsize, outbuf, outbufsize); + unsigned long int crc, crc_input; + unsigned int chksum, chksum_input; + size_t srclen; + char *xorbuf, *midxor; + ssize_t xorlen; + const char *midsrc; + char crcbuf[SCRAMBLE_CRC_LEN + 2]; // Leave room for '\n\0' + char chksumbuf[SCRAMBLE_CHKSUM_LEN + 2]; + + + assert(dest != NULL); + assert(src != NULL); + assert(size > 0); + + srclen = strlen(src); + + if (key == NULL) { + // No decryption required + assert(size >= srclen + 1); + strcpy(dest, src); + } else { + // Unscramble the input + + // Copy out simple checksum from input + memcpy(chksumbuf, src, SCRAMBLE_CHKSUM_LEN); + chksumbuf[SCRAMBLE_CHKSUM_LEN] = '\n'; + chksumbuf[SCRAMBLE_CHKSUM_LEN + 1] = '\0'; + if (sscanf(chksumbuf, "%x\n", &chksum_input) != 1) { + return NULL; + } + + // Calculate and compare checksums + midsrc = src + SCRAMBLE_CHKSUM_LEN; + chksum = 0; + for (const char *p = midsrc; *p != '\0' && *p != '\n'; p++) { + chksum += *p; + } + chksum &= SCRAMBLE_CHKSUM_MASK; + + if (chksum != chksum_input) { + return NULL; + } + + xorbuf = xmalloc(size + SCRAMBLE_CRC_LEN); + + // Decode buffer sans checksum using Base64 + xorlen = b64decode(midsrc, srclen - SCRAMBLE_CHKSUM_LEN, + xorbuf, size + SCRAMBLE_CRC_LEN); + if (xorlen < SCRAMBLE_CRC_LEN) { + free(xorbuf); + return NULL; + } + + // Copy out CRC32 checksum + memcpy(crcbuf, xorbuf, SCRAMBLE_CRC_LEN); + crcbuf[SCRAMBLE_CRC_LEN] = '\n'; + crcbuf[SCRAMBLE_CRC_LEN + 1] = '\0'; + if (sscanf(crcbuf, "%lx\n", &crc_input) != 1) { + free(xorbuf); + return NULL; + } + + // Calculate and compare CRC32 checksums + midxor = xorbuf + SCRAMBLE_CRC_LEN; + crc = crc32(midxor, xorlen - SCRAMBLE_CRC_LEN) & SCRAMBLE_CRC_MASK; + if (crc != crc_input) { + free(xorbuf); + return NULL; + } + + // Descramble xorbuf using *key, ignoring CRC32 in front + apply_xor(dest, midxor, xorlen - SCRAMBLE_CRC_LEN, key); + + // Convert the output to a C string + assert(size >= xorlen - SCRAMBLE_CRC_LEN + 1); + dest[xorlen - SCRAMBLE_CRC_LEN] = '\0'; + + free(xorbuf); + } + + return dest; +} + + +/***********************************************************************/ +// apply_xor: Scramble a buffer using xor_table + +void apply_xor (void *restrict dest, const void *restrict src, + size_t n, unsigned int *restrict key) +{ + assert(dest != NULL); + assert(src != NULL); + assert(key != NULL); + assert(*key < XOR_TABLE_SIZE); + + for (size_t i = 0; i < n; i++, dest++, src++) { + *(unsigned char *) dest = *(unsigned char *) src ^ xor_table[*key]; + *key = (*key + 1) % XOR_TABLE_SIZE; + } +} + + +/***********************************************************************/ +// b64encode: Convert a block to non-standard Base64 encoding + +size_t b64encode (const void *restrict in, size_t inlen, + void *restrict out, size_t outlen) +{ + size_t count; + size_t padding; + + // Note that bit manipulations on strings require unsigned char! + const unsigned char *u_in = in; + unsigned char *u_out = out; + + + assert(u_in != NULL); + assert(u_out != NULL); + assert(outlen > 0); + assert(outlen > inlen); + + count = 0; + padding = inlen % 3; + + for (size_t i = 0; i < inlen; i += 3, u_in += 3) { + unsigned long int n; + unsigned char n0, n1, n2, n3; + + // Convert three input bytes into a 24-bit number + n = u_in[0] << 16; + if (i + 1 < inlen) { + n += u_in[1] << 8; + } + if (i + 2 < inlen) { + n += u_in[2]; + } + + // Convert the 24-bit number into four Base64 bytes + n0 = (unsigned char) (n >> 18) & 0x3F; + n1 = (unsigned char) (n >> 12) & 0x3F; + n2 = (unsigned char) (n >> 6) & 0x3F; + n3 = (unsigned char) n & 0x3F; + + assert(count + 3 < outlen); + + *u_out++ = scramble_table[n0]; + *u_out++ = scramble_table[n1]; + count += 2; + + if (i + 1 < inlen) { + *u_out++ = scramble_table[n2]; + count++; + } + if (i + 2 < inlen) { + *u_out++ = scramble_table[n3]; + count++; + } + } + + if (padding > 0) { + assert(count + 2 < outlen); + for (; padding < 3; padding++) { + *u_out++ = SCRAMBLE_PAD_CHAR; + count++; + } + } + + assert(count + 2 <= outlen); + + *u_out++ = '\n'; + *u_out = '\0'; + count++; + + return count; +} + + +/***********************************************************************/ +// b64decode: Convert a block from non-standard Base64 encoding + +ssize_t b64decode (const void *restrict in, size_t inlen, + void *restrict out, size_t outlen) +{ + size_t count; + unsigned long int n; + + // Note that bit manipulations on strings require unsigned char! + // Using char * results in very subtle bugs indeed... + const unsigned char *u_in = in; + unsigned char *u_out = out; + + + assert(u_in != NULL); + assert(u_out != NULL); + assert(outlen > 0); + + count = 0; + n = 1; + + for (size_t i = 0; i < inlen && *u_in != '\0'; i++, u_in++) { + char c = *u_in > UNSCRAMBLE_TABLE_SIZE ? + UNSCRAMBLE_INVALID : unscramble_table[*u_in]; + + switch (c) { + case UNSCRAMBLE_INVALID: + return -1; + + case UNSCRAMBLE_IGNORE: + continue; + + case UNSCRAMBLE_PAD_CHAR: + // Assume end of data + i = inlen; + continue; + + default: + n = n << 6 | c; // c is 0 .. 63 + + if (n & 0x1000000) { + // Convert 24-bit number into three output bytes + count += 3; + if (count > outlen) { + return -1; + } + + *u_out++ = n >> 16; + *u_out++ = n >> 8; + *u_out++ = n; + n = 1; + } + } + } + + if (n & 0x40000) { + count += 2; + if (count > outlen) { + return -1; + } + + *u_out++ = n >> 10; + *u_out++ = n >> 2; + } else if (n & 0x1000) { + count += 1; + if (count > outlen) { + return -1; + } + + *u_out++ = n >> 4; + } + + return count; } diff --git a/src/utils.h b/src/utils.h index 6ca4686..2029969 100644 --- a/src/utils.h +++ b/src/utils.h @@ -260,59 +260,58 @@ extern ssize_t l_strfmon (char *restrict buf, size_t maxsize, ************************************************************************/ /* - The functions described here are simple in the extreme: they are only - designed to stop casual cheating! + The functions described here are NOT cryptographically secure: they are + only designed to stop casual cheating! */ /* - Function: scramble - Scramble (encrypt) the buffer - Parameters: key - Pointer to encryption/decryption key - inbuf - Pointer to input buffer to encrypt - inbufsize - Size of input buffer - outbuf - Pointer to output buffer - outbufsize - Size of output buffer - Returns: char * - Pointer to output buffer + Function: scramble - Scramble (encrypt) the buffer + Parameters: dest - Pointer to output buffer + src - Pointer to input buffer to encrypt + size - Size of output buffer + key - Pointer to encryption/decryption key + Returns: char * - Pointer to output buffer - This function scrambles (encrypts) the buffer *inbuf using a trivial - encryption algorithm and places the result in *outbuf. If key is NULL - or *key is zero, no encryption takes place: the input buffer is copied - to the output buffer as-is. + This function scrambles (encrypts) the buffer *src and places the + result in *dest. It uses *key to keep a running encryption key. If + the key is NULL, no encryption is performed. The input buffer should contain a C-style string terminated by '\0'. - The characters '\r', '\n' and '\0' are guaranteed to remain the same - before and after encryption. Note that inbuf and outbuf MUST point to - different buffers, and that outbuf typically must be four times larger - than inbuf. At most inbufsize bytes are encrypted; outbuf is returned - as the result. + The output buffer will be terminated with '\n\0', even if the input + does not have a terminating '\n'. The pointer dest is returned as the + output. + + Note that src and dest MUST point to different buffers, and that *dest + typically must be twice as large as *src. In addition, *key MUST be + initialised to zero before calling scramble() for the first time. */ -extern char *scramble (unsigned char *restrict key, - char *restrict inbuf, int inbufsize, - char *restrict outbuf, int outbufsize); +extern char *scramble (char *restrict dest, const char *restrict src, + size_t size, unsigned int *restrict key); /* Function: unscramble - Unscramble (decrypt) the buffer - Parameters: key - Pointer to encryption/decryption key - inbuf - Pointer to input buffer to decrypt - inbufsize - Size of input buffer - outbuf - Pointer to output buffer - outbufsize - Size of output buffer - Returns: char * - Pointer to output buffer + Parameters: dest - Pointer to output buffer + src - Pointer to input buffer to decrypt + size - Size of output buffer + key - Pointer to encryption/decryption key + Returns: char * - Pointer to output buffer or NULL on error This function does the reverse of scramble(): it unscrambles (decrypts) - the buffer *inbuf using a trivial algorithm and places the result in - *outbuf. If key is NULL or *key is zero, no decryption takes place: - the input buffer is copied to the output buffer as-is. + the buffer *src and places the result in *dest. If key is NULL, no + decryption takes place: the input buffer is copied to the output buffer + without changes. - The buffer should contain a C-style string terminated by '\0'. As for - scramble(), the characters '\r', '\n' and '\0' will not be changed (nor - will any encrypted character map back to these values). Note that - inbuf and outbuf MUST point to different buffers. At most bufsize - bytes are decrypted; outbuf is returned as the result. + The buffer should contain a C-style string terminated by '\0'. Note + that src and dest MUST point to different buffers. The pointer dest is + returned as the output, unless there is an error in the data (such as a + corrupted checksum), in which case NULL is returned. + + Note that *key MUST be initialised to zero before calling unscramble() + for the first time. */ -extern char *unscramble (unsigned char *restrict key, - char *restrict inbuf, int inbufsize, - char *restrict outbuf, int outbufsize); +extern char *unscramble (char *restrict dest, const char *restrict src, + size_t size, unsigned int *restrict key); /************************************************************************ From 0d3362577cba2a41b539483a759eea81b15f9017 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 23 May 2014 19:03:22 +1000 Subject: [PATCH 31/39] Regenerate all PO files --- po/da.po | 62 +++++++++--------- po/de.po | 62 +++++++++--------- po/en_AU.po | 186 ++++++++++++++++++++++++++-------------------------- po/en_CA.po | 186 ++++++++++++++++++++++++++-------------------------- po/en_GB.po | 186 ++++++++++++++++++++++++++-------------------------- po/en_US.po | 186 ++++++++++++++++++++++++++-------------------------- po/eo.po | 62 +++++++++--------- po/fi.po | 62 +++++++++--------- po/fr.po | 62 +++++++++--------- po/hr.po | 62 +++++++++--------- po/nb.po | 62 +++++++++--------- po/ru.po | 62 +++++++++--------- 12 files changed, 620 insertions(+), 620 deletions(-) diff --git a/po/da.po b/po/da.po index 645b290..7747a8d 100644 --- a/po/da.po +++ b/po/da.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2013-01-18 18:12+1100\n" +"POT-Creation-Date: 2014-05-23 19:00+1000\n" "PO-Revision-Date: 2014-05-22 10:57+1000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -1118,52 +1118,57 @@ msgstr[1] "" "%ls har udstedt\n" "^{%'ld^} yderligere aktier." -#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387 #, c-format msgid "%s: missing field on line %d" msgstr "%s: manglende felt på linje %d" -#: src/fileio.c:60 +#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393 +#, c-format +msgid "%s: illegal field on line %d" +msgstr "%s: ugyldigt felt på linje %d" + +#: src/fileio.c:51 #, c-format msgid "%s: illegal field on line %d: `%s'" msgstr "%s: ugyldigt felt på linje %d: »%s«" -#: src/fileio.c:64 +#: src/fileio.c:55 #, c-format msgid "%s: illegal value on line %d: `%s'" msgstr "%s: ugyldigt felt på linje %d: »%s«" -#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 +#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 #, c-format msgid "%s: illegal value on line %d" msgstr "%s: ugyldig værdi på linje %d" -#: src/fileio.c:103 +#: src/fileio.c:98 #, c-format msgid "%s: illegal characters on line %d" msgstr "%s: ugyldige tegn på linje %d" -#: src/fileio.c:184 +#: src/fileio.c:183 #, c-format msgid "%s: could not convert string" msgstr "%s: kunne ikke konvertere streng" -#: src/fileio.c:255 +#: src/fileio.c:257 #, c-format msgid " Game Not Found " msgstr " Spil blev ikke fundet " -#: src/fileio.c:256 +#: src/fileio.c:258 #, c-format msgid "Game %d has not been saved to disk." msgstr "Spillet %d er ikke blevet gemt til harddisken." -#: src/fileio.c:263 +#: src/fileio.c:265 #, c-format msgid " Game Not Loaded " msgstr " Spil blev ikke indlæst " -#: src/fileio.c:264 +#: src/fileio.c:266 #, c-format msgid "" "Game %d could not be loaded from disk.\n" @@ -1174,47 +1179,42 @@ msgstr "" "\n" "^{Fil %s: %s^}" -#: src/fileio.c:316 +#: src/fileio.c:319 #, c-format msgid "%s: missing header in game file" msgstr "%s: mangler hoved i spilfil" -#: src/fileio.c:319 +#: src/fileio.c:322 #, c-format msgid "%s: not a valid game file" msgstr "%s: ikke en gyldig spilfil" -#: src/fileio.c:322 src/fileio.c:329 +#: src/fileio.c:325 src/fileio.c:332 #, c-format msgid "%s: missing subheader in game file" msgstr "%s: mangler underhoved i spilfil" -#: src/fileio.c:325 +#: src/fileio.c:328 #, c-format msgid "%s: saved under a different version of Star Traders" msgstr "%s: gemt under en anden version af Star Traders" -#: src/fileio.c:332 +#: src/fileio.c:335 #, c-format msgid "%s: saved under an incompatible character encoding" msgstr "%s: gemt med en tegnkodning der ikke er kompatibel" -#: src/fileio.c:340 +#: src/fileio.c:343 #, c-format msgid "%s: illegal or missing field on line %d" msgstr "%s: ugyldigt eller manglende felt på linje %d" -#: src/fileio.c:384 -#, c-format -msgid "%s: illegal field on line %d" -msgstr "%s: ugyldigt felt på linje %d" - -#: src/fileio.c:466 src/fileio.c:487 +#: src/fileio.c:479 src/fileio.c:501 #, c-format msgid " Game Not Saved " msgstr " Spil blev ikke gemt " -#: src/fileio.c:467 +#: src/fileio.c:480 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1225,7 +1225,7 @@ msgstr "" "\n" "^{Mappe %s: %s^}" -#: src/fileio.c:488 +#: src/fileio.c:502 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1640,31 +1640,31 @@ msgctxt "answer" msgid "No" msgstr "Nej" -#: src/utils.c:199 src/utils.c:220 +#: src/utils.c:378 src/utils.c:399 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:225 +#: src/utils.c:404 msgid ": " msgstr ": " -#: src/utils.c:238 +#: src/utils.c:417 #, c-format msgid "out of memory" msgstr "ikke nok hukommelse" -#: src/utils.c:571 +#: src/utils.c:1041 #, c-format msgid "xmbstowcs: `%s'" msgstr "xmbstowcs: »%s«" -#: src/utils.c:611 +#: src/utils.c:1081 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:616 +#: src/utils.c:1086 #, c-format msgid "xwcrtomb: `%lc'" msgstr "xwcrtomb: »%lc«" diff --git a/po/de.po b/po/de.po index 5209e34..7635518 100644 --- a/po/de.po +++ b/po/de.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-05-09 07:02+1000\n" +"POT-Creation-Date: 2014-05-23 19:00+1000\n" "PO-Revision-Date: 2014-05-22 10:57+1000\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" @@ -1123,52 +1123,57 @@ msgstr[1] "" "%ls hat ^{%'ld^}\n" "weitere Aktien ausgegeben." -#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387 #, c-format msgid "%s: missing field on line %d" msgstr "%s: in Zeile %d fehlt ein Feld" -#: src/fileio.c:60 +#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393 +#, c-format +msgid "%s: illegal field on line %d" +msgstr "%s: unzulässiges Feld in Zeile %d" + +#: src/fileio.c:51 #, c-format msgid "%s: illegal field on line %d: `%s'" msgstr "%s: unzulässiges Feld in Zeile %d: „%s“" -#: src/fileio.c:64 +#: src/fileio.c:55 #, c-format msgid "%s: illegal value on line %d: `%s'" msgstr "%s: unzulässiger Wert in Zeile %d: „%s“" -#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 +#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 #, c-format msgid "%s: illegal value on line %d" msgstr "%s: unzulässiger Wert in Zeile %d" -#: src/fileio.c:103 +#: src/fileio.c:98 #, c-format msgid "%s: illegal characters on line %d" msgstr "%s: unzulässiges Zeichen in Zeile %d" -#: src/fileio.c:184 +#: src/fileio.c:183 #, c-format msgid "%s: could not convert string" msgstr "%s: die Zeichenkette konnte nicht umgewandelt werden" -#: src/fileio.c:255 +#: src/fileio.c:257 #, c-format msgid " Game Not Found " msgstr " Spiel nicht gefunden " -#: src/fileio.c:256 +#: src/fileio.c:258 #, c-format msgid "Game %d has not been saved to disk." msgstr "Spiel %d wurde nicht abgespeichert." -#: src/fileio.c:263 +#: src/fileio.c:265 #, c-format msgid " Game Not Loaded " msgstr " Spiel nicht geladen " -#: src/fileio.c:264 +#: src/fileio.c:266 #, c-format msgid "" "Game %d could not be loaded from disk.\n" @@ -1179,47 +1184,42 @@ msgstr "" "\n" "^{Spiel %s: %s^}" -#: src/fileio.c:316 +#: src/fileio.c:319 #, c-format msgid "%s: missing header in game file" msgstr "%s: Die Spieldatei hat keinen Vorspann" -#: src/fileio.c:319 +#: src/fileio.c:322 #, c-format msgid "%s: not a valid game file" msgstr "%s: ist keine gültige Spieldatei" -#: src/fileio.c:322 src/fileio.c:329 +#: src/fileio.c:325 src/fileio.c:332 #, c-format msgid "%s: missing subheader in game file" msgstr "%s: In der Spieldatei fehlt ein zusätzlicher Vorspann" -#: src/fileio.c:325 +#: src/fileio.c:328 #, c-format msgid "%s: saved under a different version of Star Traders" msgstr "%s: wurde unter einer anderen Version von Star Traders gespeichert" -#: src/fileio.c:332 +#: src/fileio.c:335 #, c-format msgid "%s: saved under an incompatible character encoding" msgstr "%s: unter einer inkompatiblen Zeichenkodierung abgespeichert" -#: src/fileio.c:340 +#: src/fileio.c:343 #, c-format msgid "%s: illegal or missing field on line %d" msgstr "%s: unzulässiges oder fehlendes Feld in Zeile %d" -#: src/fileio.c:384 -#, c-format -msgid "%s: illegal field on line %d" -msgstr "%s: unzulässiges Feld in Zeile %d" - -#: src/fileio.c:466 src/fileio.c:487 +#: src/fileio.c:479 src/fileio.c:501 #, c-format msgid " Game Not Saved " msgstr " Spiel Nicht Gespeichert " -#: src/fileio.c:467 +#: src/fileio.c:480 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1230,7 +1230,7 @@ msgstr "" "\n" "^{Verzeichnis %s: %s^}" -#: src/fileio.c:488 +#: src/fileio.c:502 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1644,31 +1644,31 @@ msgctxt "answer" msgid "No" msgstr "Nein" -#: src/utils.c:199 src/utils.c:220 +#: src/utils.c:378 src/utils.c:399 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:225 +#: src/utils.c:404 msgid ": " msgstr ": " -#: src/utils.c:238 +#: src/utils.c:417 #, c-format msgid "out of memory" msgstr "Kein frier Speicer mehr vorhanden" -#: src/utils.c:571 +#: src/utils.c:1041 #, c-format msgid "xmbstowcs: `%s'" msgstr "xmbstowcs: „%s“" -#: src/utils.c:611 +#: src/utils.c:1081 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:616 +#: src/utils.c:1086 #, c-format msgid "xwcrtomb: `%lc'" msgstr "xwcrtomb: „%lc“" diff --git a/po/en_AU.po b/po/en_AU.po index b950711..2244512 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-05-09 07:02+1000\n" +"POT-Creation-Date: 2014-05-23 19:00+1000\n" "PO-Revision-Date: 2014-05-22 10:57+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" @@ -1110,103 +1110,103 @@ msgstr[1] "" "%ls has issued\n" "^{%'ld^} more shares." -#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387 #, c-format msgid "%s: missing field on line %d" msgstr "%s: missing field on line %d" -#: src/fileio.c:60 -#, c-format -msgid "%s: illegal field on line %d: `%s'" -msgstr "%s: illegal field on line %d: ‘%s’" - -#: src/fileio.c:64 -#, c-format -msgid "%s: illegal value on line %d: `%s'" -msgstr "%s: illegal value on line %d: ‘%s’" - -#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 -#, c-format -msgid "%s: illegal value on line %d" -msgstr "%s: illegal value on line %d" - -#: src/fileio.c:103 -#, c-format -msgid "%s: illegal characters on line %d" -msgstr "%s: illegal characters on line %d" - -#: src/fileio.c:184 -#, c-format -msgid "%s: could not convert string" -msgstr "%s: could not convert string" - -#: src/fileio.c:255 -#, c-format -msgid " Game Not Found " -msgstr " Game Not Found " - -#: src/fileio.c:256 -#, c-format -msgid "Game %d has not been saved to disk." -msgstr "Game %d has not been saved to disk." - -#: src/fileio.c:263 -#, c-format -msgid " Game Not Loaded " -msgstr " Game Not Loaded " - -#: src/fileio.c:264 -#, c-format -msgid "" -"Game %d could not be loaded from disk.\n" -"\n" -"^{File %s: %s^}" -msgstr "" -"Game %d could not be loaded from disk.\n" -"\n" -"^{File %s: %s^}" - -#: src/fileio.c:316 -#, c-format -msgid "%s: missing header in game file" -msgstr "%s: missing header in game file" - -#: src/fileio.c:319 -#, c-format -msgid "%s: not a valid game file" -msgstr "%s: not a valid game file" - -#: src/fileio.c:322 src/fileio.c:329 -#, c-format -msgid "%s: missing subheader in game file" -msgstr "%s: missing subheader in game file" - -#: src/fileio.c:325 -#, c-format -msgid "%s: saved under a different version of Star Traders" -msgstr "%s: saved under a different version of Star Traders" - -#: src/fileio.c:332 -#, c-format -msgid "%s: saved under an incompatible character encoding" -msgstr "%s: saved under an incompatible character encoding" - -#: src/fileio.c:340 -#, c-format -msgid "%s: illegal or missing field on line %d" -msgstr "%s: illegal or missing field on line %d" - -#: src/fileio.c:384 +#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393 #, c-format msgid "%s: illegal field on line %d" msgstr "%s: illegal field on line %d" -#: src/fileio.c:466 src/fileio.c:487 +#: src/fileio.c:51 +#, c-format +msgid "%s: illegal field on line %d: `%s'" +msgstr "%s: illegal field on line %d: ‘%s’" + +#: src/fileio.c:55 +#, c-format +msgid "%s: illegal value on line %d: `%s'" +msgstr "%s: illegal value on line %d: ‘%s’" + +#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 +#, c-format +msgid "%s: illegal value on line %d" +msgstr "%s: illegal value on line %d" + +#: src/fileio.c:98 +#, c-format +msgid "%s: illegal characters on line %d" +msgstr "%s: illegal characters on line %d" + +#: src/fileio.c:183 +#, c-format +msgid "%s: could not convert string" +msgstr "%s: could not convert string" + +#: src/fileio.c:257 +#, c-format +msgid " Game Not Found " +msgstr " Game Not Found " + +#: src/fileio.c:258 +#, c-format +msgid "Game %d has not been saved to disk." +msgstr "Game %d has not been saved to disk." + +#: src/fileio.c:265 +#, c-format +msgid " Game Not Loaded " +msgstr " Game Not Loaded " + +#: src/fileio.c:266 +#, c-format +msgid "" +"Game %d could not be loaded from disk.\n" +"\n" +"^{File %s: %s^}" +msgstr "" +"Game %d could not be loaded from disk.\n" +"\n" +"^{File %s: %s^}" + +#: src/fileio.c:319 +#, c-format +msgid "%s: missing header in game file" +msgstr "%s: missing header in game file" + +#: src/fileio.c:322 +#, c-format +msgid "%s: not a valid game file" +msgstr "%s: not a valid game file" + +#: src/fileio.c:325 src/fileio.c:332 +#, c-format +msgid "%s: missing subheader in game file" +msgstr "%s: missing subheader in game file" + +#: src/fileio.c:328 +#, c-format +msgid "%s: saved under a different version of Star Traders" +msgstr "%s: saved under a different version of Star Traders" + +#: src/fileio.c:335 +#, c-format +msgid "%s: saved under an incompatible character encoding" +msgstr "%s: saved under an incompatible character encoding" + +#: src/fileio.c:343 +#, c-format +msgid "%s: illegal or missing field on line %d" +msgstr "%s: illegal or missing field on line %d" + +#: src/fileio.c:479 src/fileio.c:501 #, c-format msgid " Game Not Saved " msgstr " Game Not Saved " -#: src/fileio.c:467 +#: src/fileio.c:480 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1217,7 +1217,7 @@ msgstr "" "\n" "^{Directory %s: %s^}" -#: src/fileio.c:488 +#: src/fileio.c:502 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1629,31 +1629,31 @@ msgctxt "answer" msgid "No" msgstr "No" -#: src/utils.c:199 src/utils.c:220 +#: src/utils.c:378 src/utils.c:399 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:225 +#: src/utils.c:404 msgid ": " msgstr ": " -#: src/utils.c:238 +#: src/utils.c:417 #, c-format msgid "out of memory" msgstr "out of memory" -#: src/utils.c:571 +#: src/utils.c:1041 #, c-format msgid "xmbstowcs: `%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:611 +#: src/utils.c:1081 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:616 +#: src/utils.c:1086 #, c-format msgid "xwcrtomb: `%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/en_CA.po b/po/en_CA.po index 3d0f029..42a1022 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-05-09 07:02+1000\n" +"POT-Creation-Date: 2014-05-23 19:00+1000\n" "PO-Revision-Date: 2014-05-22 10:58+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" @@ -1110,103 +1110,103 @@ msgstr[1] "" "%ls has issued\n" "^{%'ld^} more shares." -#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387 #, c-format msgid "%s: missing field on line %d" msgstr "%s: missing field on line %d" -#: src/fileio.c:60 -#, c-format -msgid "%s: illegal field on line %d: `%s'" -msgstr "%s: illegal field on line %d: ‘%s’" - -#: src/fileio.c:64 -#, c-format -msgid "%s: illegal value on line %d: `%s'" -msgstr "%s: illegal value on line %d: ‘%s’" - -#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 -#, c-format -msgid "%s: illegal value on line %d" -msgstr "%s: illegal value on line %d" - -#: src/fileio.c:103 -#, c-format -msgid "%s: illegal characters on line %d" -msgstr "%s: illegal characters on line %d" - -#: src/fileio.c:184 -#, c-format -msgid "%s: could not convert string" -msgstr "%s: could not convert string" - -#: src/fileio.c:255 -#, c-format -msgid " Game Not Found " -msgstr " Game Not Found " - -#: src/fileio.c:256 -#, c-format -msgid "Game %d has not been saved to disk." -msgstr "Game %d has not been saved to disk." - -#: src/fileio.c:263 -#, c-format -msgid " Game Not Loaded " -msgstr " Game Not Loaded " - -#: src/fileio.c:264 -#, c-format -msgid "" -"Game %d could not be loaded from disk.\n" -"\n" -"^{File %s: %s^}" -msgstr "" -"Game %d could not be loaded from disk.\n" -"\n" -"^{File %s: %s^}" - -#: src/fileio.c:316 -#, c-format -msgid "%s: missing header in game file" -msgstr "%s: missing header in game file" - -#: src/fileio.c:319 -#, c-format -msgid "%s: not a valid game file" -msgstr "%s: not a valid game file" - -#: src/fileio.c:322 src/fileio.c:329 -#, c-format -msgid "%s: missing subheader in game file" -msgstr "%s: missing subheader in game file" - -#: src/fileio.c:325 -#, c-format -msgid "%s: saved under a different version of Star Traders" -msgstr "%s: saved under a different version of Star Traders" - -#: src/fileio.c:332 -#, c-format -msgid "%s: saved under an incompatible character encoding" -msgstr "%s: saved under an incompatible character encoding" - -#: src/fileio.c:340 -#, c-format -msgid "%s: illegal or missing field on line %d" -msgstr "%s: illegal or missing field on line %d" - -#: src/fileio.c:384 +#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393 #, c-format msgid "%s: illegal field on line %d" msgstr "%s: illegal field on line %d" -#: src/fileio.c:466 src/fileio.c:487 +#: src/fileio.c:51 +#, c-format +msgid "%s: illegal field on line %d: `%s'" +msgstr "%s: illegal field on line %d: ‘%s’" + +#: src/fileio.c:55 +#, c-format +msgid "%s: illegal value on line %d: `%s'" +msgstr "%s: illegal value on line %d: ‘%s’" + +#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 +#, c-format +msgid "%s: illegal value on line %d" +msgstr "%s: illegal value on line %d" + +#: src/fileio.c:98 +#, c-format +msgid "%s: illegal characters on line %d" +msgstr "%s: illegal characters on line %d" + +#: src/fileio.c:183 +#, c-format +msgid "%s: could not convert string" +msgstr "%s: could not convert string" + +#: src/fileio.c:257 +#, c-format +msgid " Game Not Found " +msgstr " Game Not Found " + +#: src/fileio.c:258 +#, c-format +msgid "Game %d has not been saved to disk." +msgstr "Game %d has not been saved to disk." + +#: src/fileio.c:265 +#, c-format +msgid " Game Not Loaded " +msgstr " Game Not Loaded " + +#: src/fileio.c:266 +#, c-format +msgid "" +"Game %d could not be loaded from disk.\n" +"\n" +"^{File %s: %s^}" +msgstr "" +"Game %d could not be loaded from disk.\n" +"\n" +"^{File %s: %s^}" + +#: src/fileio.c:319 +#, c-format +msgid "%s: missing header in game file" +msgstr "%s: missing header in game file" + +#: src/fileio.c:322 +#, c-format +msgid "%s: not a valid game file" +msgstr "%s: not a valid game file" + +#: src/fileio.c:325 src/fileio.c:332 +#, c-format +msgid "%s: missing subheader in game file" +msgstr "%s: missing subheader in game file" + +#: src/fileio.c:328 +#, c-format +msgid "%s: saved under a different version of Star Traders" +msgstr "%s: saved under a different version of Star Traders" + +#: src/fileio.c:335 +#, c-format +msgid "%s: saved under an incompatible character encoding" +msgstr "%s: saved under an incompatible character encoding" + +#: src/fileio.c:343 +#, c-format +msgid "%s: illegal or missing field on line %d" +msgstr "%s: illegal or missing field on line %d" + +#: src/fileio.c:479 src/fileio.c:501 #, c-format msgid " Game Not Saved " msgstr " Game Not Saved " -#: src/fileio.c:467 +#: src/fileio.c:480 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1217,7 +1217,7 @@ msgstr "" "\n" "^{Directory %s: %s^}" -#: src/fileio.c:488 +#: src/fileio.c:502 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1629,31 +1629,31 @@ msgctxt "answer" msgid "No" msgstr "No" -#: src/utils.c:199 src/utils.c:220 +#: src/utils.c:378 src/utils.c:399 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:225 +#: src/utils.c:404 msgid ": " msgstr ": " -#: src/utils.c:238 +#: src/utils.c:417 #, c-format msgid "out of memory" msgstr "out of memory" -#: src/utils.c:571 +#: src/utils.c:1041 #, c-format msgid "xmbstowcs: `%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:611 +#: src/utils.c:1081 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:616 +#: src/utils.c:1086 #, c-format msgid "xwcrtomb: `%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/en_GB.po b/po/en_GB.po index 17f943a..c97cc8e 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-05-09 07:02+1000\n" +"POT-Creation-Date: 2014-05-23 19:00+1000\n" "PO-Revision-Date: 2014-05-22 10:58+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" @@ -1110,103 +1110,103 @@ msgstr[1] "" "%ls has issued\n" "^{%'ld^} more shares." -#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387 #, c-format msgid "%s: missing field on line %d" msgstr "%s: missing field on line %d" -#: src/fileio.c:60 -#, c-format -msgid "%s: illegal field on line %d: `%s'" -msgstr "%s: illegal field on line %d: ‘%s’" - -#: src/fileio.c:64 -#, c-format -msgid "%s: illegal value on line %d: `%s'" -msgstr "%s: illegal value on line %d: ‘%s’" - -#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 -#, c-format -msgid "%s: illegal value on line %d" -msgstr "%s: illegal value on line %d" - -#: src/fileio.c:103 -#, c-format -msgid "%s: illegal characters on line %d" -msgstr "%s: illegal characters on line %d" - -#: src/fileio.c:184 -#, c-format -msgid "%s: could not convert string" -msgstr "%s: could not convert string" - -#: src/fileio.c:255 -#, c-format -msgid " Game Not Found " -msgstr " Game Not Found " - -#: src/fileio.c:256 -#, c-format -msgid "Game %d has not been saved to disk." -msgstr "Game %d has not been saved to disk." - -#: src/fileio.c:263 -#, c-format -msgid " Game Not Loaded " -msgstr " Game Not Loaded " - -#: src/fileio.c:264 -#, c-format -msgid "" -"Game %d could not be loaded from disk.\n" -"\n" -"^{File %s: %s^}" -msgstr "" -"Game %d could not be loaded from disk.\n" -"\n" -"^{File %s: %s^}" - -#: src/fileio.c:316 -#, c-format -msgid "%s: missing header in game file" -msgstr "%s: missing header in game file" - -#: src/fileio.c:319 -#, c-format -msgid "%s: not a valid game file" -msgstr "%s: not a valid game file" - -#: src/fileio.c:322 src/fileio.c:329 -#, c-format -msgid "%s: missing subheader in game file" -msgstr "%s: missing subheader in game file" - -#: src/fileio.c:325 -#, c-format -msgid "%s: saved under a different version of Star Traders" -msgstr "%s: saved under a different version of Star Traders" - -#: src/fileio.c:332 -#, c-format -msgid "%s: saved under an incompatible character encoding" -msgstr "%s: saved under an incompatible character encoding" - -#: src/fileio.c:340 -#, c-format -msgid "%s: illegal or missing field on line %d" -msgstr "%s: illegal or missing field on line %d" - -#: src/fileio.c:384 +#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393 #, c-format msgid "%s: illegal field on line %d" msgstr "%s: illegal field on line %d" -#: src/fileio.c:466 src/fileio.c:487 +#: src/fileio.c:51 +#, c-format +msgid "%s: illegal field on line %d: `%s'" +msgstr "%s: illegal field on line %d: ‘%s’" + +#: src/fileio.c:55 +#, c-format +msgid "%s: illegal value on line %d: `%s'" +msgstr "%s: illegal value on line %d: ‘%s’" + +#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 +#, c-format +msgid "%s: illegal value on line %d" +msgstr "%s: illegal value on line %d" + +#: src/fileio.c:98 +#, c-format +msgid "%s: illegal characters on line %d" +msgstr "%s: illegal characters on line %d" + +#: src/fileio.c:183 +#, c-format +msgid "%s: could not convert string" +msgstr "%s: could not convert string" + +#: src/fileio.c:257 +#, c-format +msgid " Game Not Found " +msgstr " Game Not Found " + +#: src/fileio.c:258 +#, c-format +msgid "Game %d has not been saved to disk." +msgstr "Game %d has not been saved to disk." + +#: src/fileio.c:265 +#, c-format +msgid " Game Not Loaded " +msgstr " Game Not Loaded " + +#: src/fileio.c:266 +#, c-format +msgid "" +"Game %d could not be loaded from disk.\n" +"\n" +"^{File %s: %s^}" +msgstr "" +"Game %d could not be loaded from disk.\n" +"\n" +"^{File %s: %s^}" + +#: src/fileio.c:319 +#, c-format +msgid "%s: missing header in game file" +msgstr "%s: missing header in game file" + +#: src/fileio.c:322 +#, c-format +msgid "%s: not a valid game file" +msgstr "%s: not a valid game file" + +#: src/fileio.c:325 src/fileio.c:332 +#, c-format +msgid "%s: missing subheader in game file" +msgstr "%s: missing subheader in game file" + +#: src/fileio.c:328 +#, c-format +msgid "%s: saved under a different version of Star Traders" +msgstr "%s: saved under a different version of Star Traders" + +#: src/fileio.c:335 +#, c-format +msgid "%s: saved under an incompatible character encoding" +msgstr "%s: saved under an incompatible character encoding" + +#: src/fileio.c:343 +#, c-format +msgid "%s: illegal or missing field on line %d" +msgstr "%s: illegal or missing field on line %d" + +#: src/fileio.c:479 src/fileio.c:501 #, c-format msgid " Game Not Saved " msgstr " Game Not Saved " -#: src/fileio.c:467 +#: src/fileio.c:480 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1217,7 +1217,7 @@ msgstr "" "\n" "^{Directory %s: %s^}" -#: src/fileio.c:488 +#: src/fileio.c:502 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1629,31 +1629,31 @@ msgctxt "answer" msgid "No" msgstr "No" -#: src/utils.c:199 src/utils.c:220 +#: src/utils.c:378 src/utils.c:399 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:225 +#: src/utils.c:404 msgid ": " msgstr ": " -#: src/utils.c:238 +#: src/utils.c:417 #, c-format msgid "out of memory" msgstr "out of memory" -#: src/utils.c:571 +#: src/utils.c:1041 #, c-format msgid "xmbstowcs: `%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:611 +#: src/utils.c:1081 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:616 +#: src/utils.c:1086 #, c-format msgid "xwcrtomb: `%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/en_US.po b/po/en_US.po index 0965f23..7f3f523 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-05-09 07:02+1000\n" +"POT-Creation-Date: 2014-05-23 19:00+1000\n" "PO-Revision-Date: 2014-05-22 10:58+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" @@ -1110,103 +1110,103 @@ msgstr[1] "" "%ls has issued\n" "^{%'ld^} more shares." -#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387 #, c-format msgid "%s: missing field on line %d" msgstr "%s: missing field on line %d" -#: src/fileio.c:60 -#, c-format -msgid "%s: illegal field on line %d: `%s'" -msgstr "%s: illegal field on line %d: ‘%s’" - -#: src/fileio.c:64 -#, c-format -msgid "%s: illegal value on line %d: `%s'" -msgstr "%s: illegal value on line %d: ‘%s’" - -#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 -#, c-format -msgid "%s: illegal value on line %d" -msgstr "%s: illegal value on line %d" - -#: src/fileio.c:103 -#, c-format -msgid "%s: illegal characters on line %d" -msgstr "%s: illegal characters on line %d" - -#: src/fileio.c:184 -#, c-format -msgid "%s: could not convert string" -msgstr "%s: could not convert string" - -#: src/fileio.c:255 -#, c-format -msgid " Game Not Found " -msgstr " Game Not Found " - -#: src/fileio.c:256 -#, c-format -msgid "Game %d has not been saved to disk." -msgstr "Game %d has not been saved to disk." - -#: src/fileio.c:263 -#, c-format -msgid " Game Not Loaded " -msgstr " Game Not Loaded " - -#: src/fileio.c:264 -#, c-format -msgid "" -"Game %d could not be loaded from disk.\n" -"\n" -"^{File %s: %s^}" -msgstr "" -"Game %d could not be loaded from disk.\n" -"\n" -"^{File %s: %s^}" - -#: src/fileio.c:316 -#, c-format -msgid "%s: missing header in game file" -msgstr "%s: missing header in game file" - -#: src/fileio.c:319 -#, c-format -msgid "%s: not a valid game file" -msgstr "%s: not a valid game file" - -#: src/fileio.c:322 src/fileio.c:329 -#, c-format -msgid "%s: missing subheader in game file" -msgstr "%s: missing subheader in game file" - -#: src/fileio.c:325 -#, c-format -msgid "%s: saved under a different version of Star Traders" -msgstr "%s: saved under a different version of Star Traders" - -#: src/fileio.c:332 -#, c-format -msgid "%s: saved under an incompatible character encoding" -msgstr "%s: saved under an incompatible character encoding" - -#: src/fileio.c:340 -#, c-format -msgid "%s: illegal or missing field on line %d" -msgstr "%s: illegal or missing field on line %d" - -#: src/fileio.c:384 +#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393 #, c-format msgid "%s: illegal field on line %d" msgstr "%s: illegal field on line %d" -#: src/fileio.c:466 src/fileio.c:487 +#: src/fileio.c:51 +#, c-format +msgid "%s: illegal field on line %d: `%s'" +msgstr "%s: illegal field on line %d: ‘%s’" + +#: src/fileio.c:55 +#, c-format +msgid "%s: illegal value on line %d: `%s'" +msgstr "%s: illegal value on line %d: ‘%s’" + +#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 +#, c-format +msgid "%s: illegal value on line %d" +msgstr "%s: illegal value on line %d" + +#: src/fileio.c:98 +#, c-format +msgid "%s: illegal characters on line %d" +msgstr "%s: illegal characters on line %d" + +#: src/fileio.c:183 +#, c-format +msgid "%s: could not convert string" +msgstr "%s: could not convert string" + +#: src/fileio.c:257 +#, c-format +msgid " Game Not Found " +msgstr " Game Not Found " + +#: src/fileio.c:258 +#, c-format +msgid "Game %d has not been saved to disk." +msgstr "Game %d has not been saved to disk." + +#: src/fileio.c:265 +#, c-format +msgid " Game Not Loaded " +msgstr " Game Not Loaded " + +#: src/fileio.c:266 +#, c-format +msgid "" +"Game %d could not be loaded from disk.\n" +"\n" +"^{File %s: %s^}" +msgstr "" +"Game %d could not be loaded from disk.\n" +"\n" +"^{File %s: %s^}" + +#: src/fileio.c:319 +#, c-format +msgid "%s: missing header in game file" +msgstr "%s: missing header in game file" + +#: src/fileio.c:322 +#, c-format +msgid "%s: not a valid game file" +msgstr "%s: not a valid game file" + +#: src/fileio.c:325 src/fileio.c:332 +#, c-format +msgid "%s: missing subheader in game file" +msgstr "%s: missing subheader in game file" + +#: src/fileio.c:328 +#, c-format +msgid "%s: saved under a different version of Star Traders" +msgstr "%s: saved under a different version of Star Traders" + +#: src/fileio.c:335 +#, c-format +msgid "%s: saved under an incompatible character encoding" +msgstr "%s: saved under an incompatible character encoding" + +#: src/fileio.c:343 +#, c-format +msgid "%s: illegal or missing field on line %d" +msgstr "%s: illegal or missing field on line %d" + +#: src/fileio.c:479 src/fileio.c:501 #, c-format msgid " Game Not Saved " msgstr " Game Not Saved " -#: src/fileio.c:467 +#: src/fileio.c:480 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1217,7 +1217,7 @@ msgstr "" "\n" "^{Directory %s: %s^}" -#: src/fileio.c:488 +#: src/fileio.c:502 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1629,31 +1629,31 @@ msgctxt "answer" msgid "No" msgstr "No" -#: src/utils.c:199 src/utils.c:220 +#: src/utils.c:378 src/utils.c:399 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:225 +#: src/utils.c:404 msgid ": " msgstr ": " -#: src/utils.c:238 +#: src/utils.c:417 #, c-format msgid "out of memory" msgstr "out of memory" -#: src/utils.c:571 +#: src/utils.c:1041 #, c-format msgid "xmbstowcs: `%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:611 +#: src/utils.c:1081 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:616 +#: src/utils.c:1086 #, c-format msgid "xwcrtomb: `%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/eo.po b/po/eo.po index d347591..2c3fea5 100644 --- a/po/eo.po +++ b/po/eo.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-05-09 13:57+1000\n" +"POT-Creation-Date: 2014-05-23 19:00+1000\n" "PO-Revision-Date: 2014-05-22 10:59+1000\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" @@ -1116,52 +1116,57 @@ msgstr[1] "" "%ls disponigis\n" "^{%'ld^} pliajn akciojn." -#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387 #, c-format msgid "%s: missing field on line %d" msgstr "%s: mankas kampon en linio %d" -#: src/fileio.c:60 +#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393 +#, c-format +msgid "%s: illegal field on line %d" +msgstr "%s: malpermesata kampo en linio %d" + +#: src/fileio.c:51 #, c-format msgid "%s: illegal field on line %d: `%s'" msgstr "%s: malpermesata kampo en linio %d: '%s'" -#: src/fileio.c:64 +#: src/fileio.c:55 #, c-format msgid "%s: illegal value on line %d: `%s'" msgstr "%s: malpermesata valoro en linio %d: '%s'" -#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 +#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 #, c-format msgid "%s: illegal value on line %d" msgstr "%s: malpermesata valoro en linio %d" -#: src/fileio.c:103 +#: src/fileio.c:98 #, c-format msgid "%s: illegal characters on line %d" msgstr "%s: malpermesataj signoj en linio %d" -#: src/fileio.c:184 +#: src/fileio.c:183 #, c-format msgid "%s: could not convert string" msgstr "%s: ne eblis konverti ĉenon" -#: src/fileio.c:255 +#: src/fileio.c:257 #, c-format msgid " Game Not Found " msgstr " Seanco ne trovita " -#: src/fileio.c:256 +#: src/fileio.c:258 #, c-format msgid "Game %d has not been saved to disk." msgstr "La seanco %d ne estas konservita en la disko." -#: src/fileio.c:263 +#: src/fileio.c:265 #, c-format msgid " Game Not Loaded " msgstr " Seanco ne ŝargita " -#: src/fileio.c:264 +#: src/fileio.c:266 #, c-format msgid "" "Game %d could not be loaded from disk.\n" @@ -1172,47 +1177,42 @@ msgstr "" "\n" "^{Dosiero %s: %s^}" -#: src/fileio.c:316 +#: src/fileio.c:319 #, c-format msgid "%s: missing header in game file" msgstr "%s: mankas kaplinio en seanc-dosiero" -#: src/fileio.c:319 +#: src/fileio.c:322 #, c-format msgid "%s: not a valid game file" msgstr "%s: ne estas valida seanc-dosiero" -#: src/fileio.c:322 src/fileio.c:329 +#: src/fileio.c:325 src/fileio.c:332 #, c-format msgid "%s: missing subheader in game file" msgstr "%s: mankas subkaplinio en seanc-dosiero" -#: src/fileio.c:325 +#: src/fileio.c:328 #, c-format msgid "%s: saved under a different version of Star Traders" msgstr "%s: konservita sub malsama versio de Star Traders" -#: src/fileio.c:332 +#: src/fileio.c:335 #, c-format msgid "%s: saved under an incompatible character encoding" msgstr "%s: konservita sub nekongrua signa enkodigo" -#: src/fileio.c:340 +#: src/fileio.c:343 #, c-format msgid "%s: illegal or missing field on line %d" msgstr "%s: malpermesata aŭ mankanta kampo en linio %d" -#: src/fileio.c:384 -#, c-format -msgid "%s: illegal field on line %d" -msgstr "%s: malpermesata kampo en linio %d" - -#: src/fileio.c:466 src/fileio.c:487 +#: src/fileio.c:479 src/fileio.c:501 #, c-format msgid " Game Not Saved " msgstr " Seanco ne konservita " -#: src/fileio.c:467 +#: src/fileio.c:480 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1223,7 +1223,7 @@ msgstr "" "\n" "^{Dosierujo %s: %s^}" -#: src/fileio.c:488 +#: src/fileio.c:502 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1635,31 +1635,31 @@ msgctxt "answer" msgid "No" msgstr "Ne" -#: src/utils.c:199 src/utils.c:220 +#: src/utils.c:378 src/utils.c:399 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:225 +#: src/utils.c:404 msgid ": " msgstr ": " -#: src/utils.c:238 +#: src/utils.c:417 #, c-format msgid "out of memory" msgstr "memoro plenpleniĝas" -#: src/utils.c:571 +#: src/utils.c:1041 #, c-format msgid "xmbstowcs: `%s'" msgstr "xmbstowcs: '%s'" -#: src/utils.c:611 +#: src/utils.c:1081 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:616 +#: src/utils.c:1086 #, c-format msgid "xwcrtomb: `%lc'" msgstr "xwcrtomb: '%lc'" diff --git a/po/fi.po b/po/fi.po index 6272157..3fc8ea0 100644 --- a/po/fi.po +++ b/po/fi.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-05-09 07:02+1000\n" +"POT-Creation-Date: 2014-05-23 19:00+1000\n" "PO-Revision-Date: 2014-05-22 10:59+1000\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" @@ -1120,52 +1120,57 @@ msgstr[1] "" "%ls on myynyt\n" "^{%'ld^} osaketta lisää." -#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387 #, c-format msgid "%s: missing field on line %d" msgstr "%s: kenttä puuttuu rivillä %d" -#: src/fileio.c:60 +#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393 +#, c-format +msgid "%s: illegal field on line %d" +msgstr "%s: virheellinen kenttä rivillä %d" + +#: src/fileio.c:51 #, c-format msgid "%s: illegal field on line %d: `%s'" msgstr "%s: virheellinen kenttä rivillä %d: ”%s”" -#: src/fileio.c:64 +#: src/fileio.c:55 #, c-format msgid "%s: illegal value on line %d: `%s'" msgstr "%s: virheellinen arvo rivillä %d: ”%s”" -#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 +#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 #, c-format msgid "%s: illegal value on line %d" msgstr "%s: virheellinen arvo rivillä %d" -#: src/fileio.c:103 +#: src/fileio.c:98 #, c-format msgid "%s: illegal characters on line %d" msgstr "%s: virheelliset merkit rivillä %d" -#: src/fileio.c:184 +#: src/fileio.c:183 #, c-format msgid "%s: could not convert string" msgstr "%s: ei voitu muuntaa merkkijonoa" -#: src/fileio.c:255 +#: src/fileio.c:257 #, c-format msgid " Game Not Found " msgstr " Peliä ei löytynyt " -#: src/fileio.c:256 +#: src/fileio.c:258 #, c-format msgid "Game %d has not been saved to disk." msgstr "Peliä %d ei ole tallennetu levylle." -#: src/fileio.c:263 +#: src/fileio.c:265 #, c-format msgid " Game Not Loaded " msgstr " Peliä ei ladattu " -#: src/fileio.c:264 +#: src/fileio.c:266 #, c-format msgid "" "Game %d could not be loaded from disk.\n" @@ -1176,47 +1181,42 @@ msgstr "" "\n" "^{Tiedosto %s: %s^}" -#: src/fileio.c:316 +#: src/fileio.c:319 #, c-format msgid "%s: missing header in game file" msgstr "%s: pelitiedostosta puuttuu otsake" -#: src/fileio.c:319 +#: src/fileio.c:322 #, c-format msgid "%s: not a valid game file" msgstr "%s: ei ole kelvollinen pelitiedosto" -#: src/fileio.c:322 src/fileio.c:329 +#: src/fileio.c:325 src/fileio.c:332 #, c-format msgid "%s: missing subheader in game file" msgstr "%s: pelitiedostosta puuttuu aliotsake" -#: src/fileio.c:325 +#: src/fileio.c:328 #, c-format msgid "%s: saved under a different version of Star Traders" msgstr "%s: tallennettu Tähtikauppiaiden eri versiona" -#: src/fileio.c:332 +#: src/fileio.c:335 #, c-format msgid "%s: saved under an incompatible character encoding" msgstr "%s: tallennettu yhteensopimattomana merkkikoodauksena" -#: src/fileio.c:340 +#: src/fileio.c:343 #, c-format msgid "%s: illegal or missing field on line %d" msgstr "%s: virheellinen tai puuttuva kenttä rivillä %d" -#: src/fileio.c:384 -#, c-format -msgid "%s: illegal field on line %d" -msgstr "%s: virheellinen kenttä rivillä %d" - -#: src/fileio.c:466 src/fileio.c:487 +#: src/fileio.c:479 src/fileio.c:501 #, c-format msgid " Game Not Saved " msgstr " Peliä ei tallennettu " -#: src/fileio.c:467 +#: src/fileio.c:480 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1227,7 +1227,7 @@ msgstr "" "\n" "^{Hakemisto %s: %s^}" -#: src/fileio.c:488 +#: src/fileio.c:502 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1639,31 +1639,31 @@ msgctxt "answer" msgid "No" msgstr "Ei" -#: src/utils.c:199 src/utils.c:220 +#: src/utils.c:378 src/utils.c:399 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:225 +#: src/utils.c:404 msgid ": " msgstr ": " -#: src/utils.c:238 +#: src/utils.c:417 #, c-format msgid "out of memory" msgstr "muisti loppui" -#: src/utils.c:571 +#: src/utils.c:1041 #, c-format msgid "xmbstowcs: `%s'" msgstr "xmbstowcs: ”%s”" -#: src/utils.c:611 +#: src/utils.c:1081 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:616 +#: src/utils.c:1086 #, c-format msgid "xwcrtomb: `%lc'" msgstr "xwcrtomb: ”%lc”" diff --git a/po/fr.po b/po/fr.po index 086f96c..38d667a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-05-09 07:02+1000\n" +"POT-Creation-Date: 2014-05-23 19:00+1000\n" "PO-Revision-Date: 2014-05-22 11:00+1000\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" @@ -1116,52 +1116,57 @@ msgstr[1] "" "%ls a émis\n" "^{%'ld^} actions en plus." -#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387 #, c-format msgid "%s: missing field on line %d" msgstr "%s: champ manquant à la ligne %d" -#: src/fileio.c:60 +#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393 +#, c-format +msgid "%s: illegal field on line %d" +msgstr "%s: champ illégal à la ligne %d" + +#: src/fileio.c:51 #, c-format msgid "%s: illegal field on line %d: `%s'" msgstr "%s: champ illégal à la ligne %d: « %s »" -#: src/fileio.c:64 +#: src/fileio.c:55 #, c-format msgid "%s: illegal value on line %d: `%s'" msgstr "%s: valeur illégale à la ligne %d: « %s »" -#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 +#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 #, c-format msgid "%s: illegal value on line %d" msgstr "%s: valeur illégale à la ligne %d" -#: src/fileio.c:103 +#: src/fileio.c:98 #, c-format msgid "%s: illegal characters on line %d" msgstr "%s: caractère illégal à la ligne %d" -#: src/fileio.c:184 +#: src/fileio.c:183 #, c-format msgid "%s: could not convert string" msgstr "%s: la chaîne n'a pas pu être convertie" -#: src/fileio.c:255 +#: src/fileio.c:257 #, c-format msgid " Game Not Found " msgstr " Jeu pas trouvé " -#: src/fileio.c:256 +#: src/fileio.c:258 #, c-format msgid "Game %d has not been saved to disk." msgstr "Le jeu %d n'a pas été enregistré sur disque." -#: src/fileio.c:263 +#: src/fileio.c:265 #, c-format msgid " Game Not Loaded " msgstr " Jeu pas chargé " -#: src/fileio.c:264 +#: src/fileio.c:266 #, c-format msgid "" "Game %d could not be loaded from disk.\n" @@ -1172,47 +1177,42 @@ msgstr "" "\n" "^{Fichier %s: %s^}" -#: src/fileio.c:316 +#: src/fileio.c:319 #, c-format msgid "%s: missing header in game file" msgstr "%s: en-tête manquant dans le fichier du jeu" -#: src/fileio.c:319 +#: src/fileio.c:322 #, c-format msgid "%s: not a valid game file" msgstr "%s: le fichier n'est pas un jeu valable" -#: src/fileio.c:322 src/fileio.c:329 +#: src/fileio.c:325 src/fileio.c:332 #, c-format msgid "%s: missing subheader in game file" msgstr "%s: sous-en-tête manquant dans le fichier de jeu" -#: src/fileio.c:325 +#: src/fileio.c:328 #, c-format msgid "%s: saved under a different version of Star Traders" msgstr "%s: enregistré par une version différente de Star Traders" -#: src/fileio.c:332 +#: src/fileio.c:335 #, c-format msgid "%s: saved under an incompatible character encoding" msgstr "%s: enregistré avec un encodage des caractères incompatible" -#: src/fileio.c:340 +#: src/fileio.c:343 #, c-format msgid "%s: illegal or missing field on line %d" msgstr "%s: champ illégal ou manquant à la ligne %d" -#: src/fileio.c:384 -#, c-format -msgid "%s: illegal field on line %d" -msgstr "%s: champ illégal à la ligne %d" - -#: src/fileio.c:466 src/fileio.c:487 +#: src/fileio.c:479 src/fileio.c:501 #, c-format msgid " Game Not Saved " msgstr " Jeu pas enregistré " -#: src/fileio.c:467 +#: src/fileio.c:480 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1223,7 +1223,7 @@ msgstr "" "\n" "^{Répertoire %s: %s^}" -#: src/fileio.c:488 +#: src/fileio.c:502 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1647,31 +1647,31 @@ msgctxt "answer" msgid "No" msgstr "Non" -#: src/utils.c:199 src/utils.c:220 +#: src/utils.c:378 src/utils.c:399 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:225 +#: src/utils.c:404 msgid ": " msgstr ": " -#: src/utils.c:238 +#: src/utils.c:417 #, c-format msgid "out of memory" msgstr "pas assez de mémoire" -#: src/utils.c:571 +#: src/utils.c:1041 #, c-format msgid "xmbstowcs: `%s'" msgstr "xmbstowcs: « %s »" -#: src/utils.c:611 +#: src/utils.c:1081 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:616 +#: src/utils.c:1086 #, c-format msgid "xwcrtomb: `%lc'" msgstr "xwcrtomb: « %lc »" diff --git a/po/hr.po b/po/hr.po index 67ae044..643df83 100644 --- a/po/hr.po +++ b/po/hr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-05-09 07:02+1000\n" +"POT-Creation-Date: 2014-05-23 19:00+1000\n" "PO-Revision-Date: 2014-05-22 11:00+1000\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" @@ -1120,52 +1120,57 @@ msgstr[2] "" "Tvrtka %ls je izdala\n" "^{%'ld^} novih dionica." -#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387 #, c-format msgid "%s: missing field on line %d" msgstr "%s: nedostaje polje u retku %d" -#: src/fileio.c:60 +#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393 +#, c-format +msgid "%s: illegal field on line %d" +msgstr "%s: nedozvoljeno polje u retku %d" + +#: src/fileio.c:51 #, c-format msgid "%s: illegal field on line %d: `%s'" msgstr "%s: nedozvoljeno polje u retku %d: „%s”" -#: src/fileio.c:64 +#: src/fileio.c:55 #, c-format msgid "%s: illegal value on line %d: `%s'" msgstr "%s: nedozvoljena vrijednost u retku %d: „%s”" -#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 +#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 #, c-format msgid "%s: illegal value on line %d" msgstr "%s: nedozvoljena vrijednost u retku %d" -#: src/fileio.c:103 +#: src/fileio.c:98 #, c-format msgid "%s: illegal characters on line %d" msgstr "%s: nedozvoljeni znak u retku %d" -#: src/fileio.c:184 +#: src/fileio.c:183 #, c-format msgid "%s: could not convert string" msgstr "%s: ne mogu pretvoriti niz znakova" -#: src/fileio.c:255 +#: src/fileio.c:257 #, c-format msgid " Game Not Found " msgstr " Igra nije pronađena " -#: src/fileio.c:256 +#: src/fileio.c:258 #, c-format msgid "Game %d has not been saved to disk." msgstr "Igra %d nije spremljena na disk." -#: src/fileio.c:263 +#: src/fileio.c:265 #, c-format msgid " Game Not Loaded " msgstr " Igra nije učitana " -#: src/fileio.c:264 +#: src/fileio.c:266 #, c-format msgid "" "Game %d could not be loaded from disk.\n" @@ -1176,47 +1181,42 @@ msgstr "" "\n" "^{Datoteka %s: %s^}" -#: src/fileio.c:316 +#: src/fileio.c:319 #, c-format msgid "%s: missing header in game file" msgstr "%s: nedostaje zaglavlje u datoteci igre" -#: src/fileio.c:319 +#: src/fileio.c:322 #, c-format msgid "%s: not a valid game file" msgstr "%s: nije ispravna datoteka igre" -#: src/fileio.c:322 src/fileio.c:329 +#: src/fileio.c:325 src/fileio.c:332 #, c-format msgid "%s: missing subheader in game file" msgstr "%s: nedostaje podzaglavlje u datoteci igre" -#: src/fileio.c:325 +#: src/fileio.c:328 #, c-format msgid "%s: saved under a different version of Star Traders" msgstr "%s: spremljena različitom inačicom igre Star Traders" -#: src/fileio.c:332 +#: src/fileio.c:335 #, c-format msgid "%s: saved under an incompatible character encoding" msgstr "%s: spremljena s nekompatibilnim kodiranjem znakova" -#: src/fileio.c:340 +#: src/fileio.c:343 #, c-format msgid "%s: illegal or missing field on line %d" msgstr "%s: nedozvoljeno ili nedostaje polje u retku %d" -#: src/fileio.c:384 -#, c-format -msgid "%s: illegal field on line %d" -msgstr "%s: nedozvoljeno polje u retku %d" - -#: src/fileio.c:466 src/fileio.c:487 +#: src/fileio.c:479 src/fileio.c:501 #, c-format msgid " Game Not Saved " msgstr " Igra nije spremljena " -#: src/fileio.c:467 +#: src/fileio.c:480 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1227,7 +1227,7 @@ msgstr "" "\n" "^{Direktorij %s: %s^}" -#: src/fileio.c:488 +#: src/fileio.c:502 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1639,31 +1639,31 @@ msgctxt "answer" msgid "No" msgstr "Ne" -#: src/utils.c:199 src/utils.c:220 +#: src/utils.c:378 src/utils.c:399 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:225 +#: src/utils.c:404 msgid ": " msgstr ": " -#: src/utils.c:238 +#: src/utils.c:417 #, c-format msgid "out of memory" msgstr "nema dovoljno memorije" -#: src/utils.c:571 +#: src/utils.c:1041 #, c-format msgid "xmbstowcs: `%s'" msgstr "xmbstowcs: „%s”" -#: src/utils.c:611 +#: src/utils.c:1081 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:616 +#: src/utils.c:1086 #, c-format msgid "xwcrtomb: `%lc'" msgstr "xwcrtomb: „%lc”" diff --git a/po/nb.po b/po/nb.po index cf85f18..08cbbf8 100644 --- a/po/nb.po +++ b/po/nb.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-05-09 13:57+1000\n" +"POT-Creation-Date: 2014-05-23 19:00+1000\n" "PO-Revision-Date: 2014-05-22 11:00+1000\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" @@ -1115,52 +1115,57 @@ msgstr[1] "" "%ls har utstedt\n" "^{%'ld^} nye aksjer." -#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387 #, c-format msgid "%s: missing field on line %d" msgstr "%s: manglende felt på linje %d" -#: src/fileio.c:60 +#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393 +#, c-format +msgid "%s: illegal field on line %d" +msgstr "%s: ulovlig felt på linje %d" + +#: src/fileio.c:51 #, c-format msgid "%s: illegal field on line %d: `%s'" msgstr "%s: ugyldig felt på linje %d: «%s»" -#: src/fileio.c:64 +#: src/fileio.c:55 #, c-format msgid "%s: illegal value on line %d: `%s'" msgstr "%s: ugyldig verdi på linje %d: «%s»" -#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 +#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 #, c-format msgid "%s: illegal value on line %d" msgstr "%s: ugyldig verdi på linje %d" -#: src/fileio.c:103 +#: src/fileio.c:98 #, c-format msgid "%s: illegal characters on line %d" msgstr "%s: ugyldig tegn på linje %d" -#: src/fileio.c:184 +#: src/fileio.c:183 #, c-format msgid "%s: could not convert string" msgstr "%s: kunne ikke konvertere streng" -#: src/fileio.c:255 +#: src/fileio.c:257 #, c-format msgid " Game Not Found " msgstr " Spill ikke funnet " -#: src/fileio.c:256 +#: src/fileio.c:258 #, c-format msgid "Game %d has not been saved to disk." msgstr "Spillet %d er ikke lagret på disken." -#: src/fileio.c:263 +#: src/fileio.c:265 #, c-format msgid " Game Not Loaded " msgstr " Spill ikke lastet " -#: src/fileio.c:264 +#: src/fileio.c:266 #, c-format msgid "" "Game %d could not be loaded from disk.\n" @@ -1171,47 +1176,42 @@ msgstr "" "\n" "^{Fil %s: %s^}" -#: src/fileio.c:316 +#: src/fileio.c:319 #, c-format msgid "%s: missing header in game file" msgstr "%s: mangler topptekst i spillfilen" -#: src/fileio.c:319 +#: src/fileio.c:322 #, c-format msgid "%s: not a valid game file" msgstr "%s: ikke en gyldig spillfil" -#: src/fileio.c:322 src/fileio.c:329 +#: src/fileio.c:325 src/fileio.c:332 #, c-format msgid "%s: missing subheader in game file" msgstr "%s: mangler undertittel i spillfilen" -#: src/fileio.c:325 +#: src/fileio.c:328 #, c-format msgid "%s: saved under a different version of Star Traders" msgstr "%s: lagret under en annen versjon av Star Traders" -#: src/fileio.c:332 +#: src/fileio.c:335 #, c-format msgid "%s: saved under an incompatible character encoding" msgstr "%s: lagret med en inkompatibel tegnkoding" -#: src/fileio.c:340 +#: src/fileio.c:343 #, c-format msgid "%s: illegal or missing field on line %d" msgstr "%s: ulovlig eller manglende felt på linje %d" -#: src/fileio.c:384 -#, c-format -msgid "%s: illegal field on line %d" -msgstr "%s: ulovlig felt på linje %d" - -#: src/fileio.c:466 src/fileio.c:487 +#: src/fileio.c:479 src/fileio.c:501 #, c-format msgid " Game Not Saved " msgstr " Spill ikke lagret " -#: src/fileio.c:467 +#: src/fileio.c:480 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1222,7 +1222,7 @@ msgstr "" "\n" "^{Mappe %s: %s^}" -#: src/fileio.c:488 +#: src/fileio.c:502 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1634,31 +1634,31 @@ msgctxt "answer" msgid "No" msgstr "Nei" -#: src/utils.c:199 src/utils.c:220 +#: src/utils.c:378 src/utils.c:399 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:225 +#: src/utils.c:404 msgid ": " msgstr ": " -#: src/utils.c:238 +#: src/utils.c:417 #, c-format msgid "out of memory" msgstr "ikke mer minne" -#: src/utils.c:571 +#: src/utils.c:1041 #, c-format msgid "xmbstowcs: `%s'" msgstr "xmbstowcs: «%s»" -#: src/utils.c:611 +#: src/utils.c:1081 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:616 +#: src/utils.c:1086 #, c-format msgid "xwcrtomb: `%lc'" msgstr "xwcrtomb: «%lc»" diff --git a/po/ru.po b/po/ru.po index 70bbf55..8748392 100644 --- a/po/ru.po +++ b/po/ru.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-05-09 07:02+1000\n" +"POT-Creation-Date: 2014-05-23 19:00+1000\n" "PO-Revision-Date: 2014-05-22 11:01+1000\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" @@ -1126,52 +1126,57 @@ msgstr[2] "" "Фирма %ls выпустила\n" "ещё ^{%'ld^} акций." -#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387 #, c-format msgid "%s: missing field on line %d" msgstr "%s: отсутствующее поле в строке %d" -#: src/fileio.c:60 +#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393 +#, c-format +msgid "%s: illegal field on line %d" +msgstr "%s: неверное поле в строке %d" + +#: src/fileio.c:51 #, c-format msgid "%s: illegal field on line %d: `%s'" msgstr "%s: неверное поле в строке %d: «%s»" -#: src/fileio.c:64 +#: src/fileio.c:55 #, c-format msgid "%s: illegal value on line %d: `%s'" msgstr "%s: неверное значение в строке %d: «%s»" -#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 +#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 #, c-format msgid "%s: illegal value on line %d" msgstr "%s: неверное значение в строке %d" -#: src/fileio.c:103 +#: src/fileio.c:98 #, c-format msgid "%s: illegal characters on line %d" msgstr "%s: неверные символы в строке %d" -#: src/fileio.c:184 +#: src/fileio.c:183 #, c-format msgid "%s: could not convert string" msgstr "%s: невозможно преобразовать строку" -#: src/fileio.c:255 +#: src/fileio.c:257 #, c-format msgid " Game Not Found " msgstr " Игра не найдена " -#: src/fileio.c:256 +#: src/fileio.c:258 #, c-format msgid "Game %d has not been saved to disk." msgstr "Игра №%d не была сохранена." -#: src/fileio.c:263 +#: src/fileio.c:265 #, c-format msgid " Game Not Loaded " msgstr " Игра не загружена " -#: src/fileio.c:264 +#: src/fileio.c:266 #, c-format msgid "" "Game %d could not be loaded from disk.\n" @@ -1182,47 +1187,42 @@ msgstr "" "\n" "^{Файл %s: %s^}" -#: src/fileio.c:316 +#: src/fileio.c:319 #, c-format msgid "%s: missing header in game file" msgstr "%s: отсутствует заголовок в игровом файле" -#: src/fileio.c:319 +#: src/fileio.c:322 #, c-format msgid "%s: not a valid game file" msgstr "%s: неверный формат игрового файла" -#: src/fileio.c:322 src/fileio.c:329 +#: src/fileio.c:325 src/fileio.c:332 #, c-format msgid "%s: missing subheader in game file" msgstr "%s: отсутствует подзаголовок в игровом файле" -#: src/fileio.c:325 +#: src/fileio.c:328 #, c-format msgid "%s: saved under a different version of Star Traders" msgstr "%s: файл сохранён в другой версии игры «Звёздные торговцы»" -#: src/fileio.c:332 +#: src/fileio.c:335 #, c-format msgid "%s: saved under an incompatible character encoding" msgstr "%s: в файле используется неподдерживаемая кодировка символов" -#: src/fileio.c:340 +#: src/fileio.c:343 #, c-format msgid "%s: illegal or missing field on line %d" msgstr "%s: неверное поле или отсутствующее поле в строке %d" -#: src/fileio.c:384 -#, c-format -msgid "%s: illegal field on line %d" -msgstr "%s: неверное поле в строке %d" - -#: src/fileio.c:466 src/fileio.c:487 +#: src/fileio.c:479 src/fileio.c:501 #, c-format msgid " Game Not Saved " msgstr " Игра не сохранена " -#: src/fileio.c:467 +#: src/fileio.c:480 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1233,7 +1233,7 @@ msgstr "" "\n" "^{Папка %s: %s^}" -#: src/fileio.c:488 +#: src/fileio.c:502 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1645,31 +1645,31 @@ msgctxt "answer" msgid "No" msgstr "Нет" -#: src/utils.c:199 src/utils.c:220 +#: src/utils.c:378 src/utils.c:399 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:225 +#: src/utils.c:404 msgid ": " msgstr ": " -#: src/utils.c:238 +#: src/utils.c:417 #, c-format msgid "out of memory" msgstr "недостаточно памяти" -#: src/utils.c:571 +#: src/utils.c:1041 #, c-format msgid "xmbstowcs: `%s'" msgstr "xmbstowcs: «%s»" -#: src/utils.c:611 +#: src/utils.c:1081 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:616 +#: src/utils.c:1086 #, c-format msgid "xwcrtomb: `%lc'" msgstr "xwcrtomb: «%lc»" From a31ff97c3dc2156f687f64fcabd2c88df01befeb Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 24 May 2014 07:28:25 +1000 Subject: [PATCH 32/39] Update the manual page date --- doc/trader.6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/trader.6 b/doc/trader.6 index b76f326..152233c 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -41,7 +41,7 @@ .if \n[.g] .mso www.tmac .\" .\" ********************************************************************* -.TH TRADER 6 "22nd May, 2014" "Unix-like systems" +.TH TRADER 6 "24th May, 2014" "Unix-like systems" .SH NAME trader \- a game of interstellar trading .\" ********************************************************************* From 1e15de58eb3a799419006a8fa7a5c3211cdd6499 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 24 May 2014 07:31:22 +1000 Subject: [PATCH 33/39] List the newly-added ax_require_defined.m4 file for distribution --- m4/Makefile.am | 1 + m4/README | 1 + 2 files changed, 2 insertions(+) diff --git a/m4/Makefile.am b/m4/Makefile.am index 80e9201..350b142 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -32,5 +32,6 @@ EXTRA_DIST = \ ax_append_flag.m4 \ ax_cflags_warn_all.m4 \ ax_c___attribute__.m4 \ + ax_require_defined.m4 \ ax_with_curses.m4 \ gnulib-cache.m4 diff --git a/m4/README b/m4/README index 896d50c..4489a04 100644 --- a/m4/README +++ b/m4/README @@ -13,6 +13,7 @@ that project's web site, http://www.gnu.org/software/autoconf-archive/: ax_append_flag.m4 ax_cflags_warn_all.m4 ax_c___attribute__.m4 + ax_require_defined.m4 ax_with_curses.m4 The following macro was generated by running the GNU Portability Library From 65601ce683cc09a9520258591eb8c6601b39cfef Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 24 May 2014 07:34:15 +1000 Subject: [PATCH 34/39] Add a list of what has changed in this version of Star Traders We finally release today, after a two-year hiatus! --- NEWS | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 2bb9074..6fca7da 100644 --- a/NEWS +++ b/NEWS @@ -15,8 +15,16 @@ consult the Subversion repository for "trader" on The ZAP Group web server at http://www.zap.org.au/services/svn/. -Version 7.5 (not yet released) ------------------------------- +Version 7.5 (24th May, 2014) +---------------------------- + +Rewrote the file input and output routines so that saved games are now +stored in a much more reliable (scrambled) ASCII format. However, saved +games from older versions will no longer load: the workaround is to start +the older version of Star Traders with the "--dont-encrypt" command line +option, load the relevant game and save it again straight away, change the +second line in the game file from "File API 7.2" to "File API 7.5", then +run the new version of Star Traders. Added translations for Norwegian Bokmål, Danish and Esperanto (in that order), with thanks to Johnny A. Solbu, Joe Hansen and Felipe Castro. From 33a976d59a36555eb9416d955d074ced0248b73f Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 24 May 2014 08:14:33 +1000 Subject: [PATCH 35/39] Add all auto-generated files Auto-generated files have been created by running ./build-aux/bootstrap with Gnulib as at commit 98ca2c063cfe019b673fd0ce81448c919e9c989c (with a date stamp of Thu May 22 17:49:33 2014 +0100), Autoconf 2.69, Automake 1.14.1 and Gettext 0.18.3. --- Makefile.in | 352 ++-- aclocal.m4 | 720 ++++---- build-aux/config.rpath | 2 +- build-aux/snippet/arg-nonnull.h | 2 +- build-aux/snippet/c++defs.h | 2 +- build-aux/snippet/unused-parameter.h | 2 +- build-aux/snippet/warn-on-use.h | 4 +- config.h.in | 169 +- configure | 2310 +++++++++++++++----------- doc/Makefile.in | 146 +- lib/Makefile.am | 52 +- lib/Makefile.in | 407 +++-- lib/btowc.c | 2 +- lib/c-ctype.c | 2 +- lib/c-ctype.h | 5 +- lib/c-strcase.h | 2 +- lib/c-strcasecmp.c | 2 +- lib/c-strncasecmp.c | 2 +- lib/config.charset | 4 +- lib/crc.c | 103 ++ lib/crc.h | 47 + lib/getopt.c | 2 +- lib/getopt.in.h | 4 +- lib/getopt1.c | 2 +- lib/getopt_int.h | 2 +- lib/gettext.h | 11 +- lib/gettimeofday.c | 2 +- lib/iconv.c | 2 +- lib/iconv.in.h | 2 +- lib/iconv_close.c | 2 +- lib/iconv_open-aix.h | 256 --- lib/iconv_open-hpux.h | 299 ---- lib/iconv_open-irix.h | 199 --- lib/iconv_open-osf.h | 278 ---- lib/iconv_open-solaris.h | 190 --- lib/iconv_open.c | 2 +- lib/localcharset.c | 16 +- lib/localcharset.h | 2 +- lib/locale.in.h | 23 +- lib/mbrtowc.c | 9 +- lib/mbsinit.c | 2 +- lib/mbsrtowcs-impl.h | 2 +- lib/mbsrtowcs-state.c | 4 +- lib/mbsrtowcs.c | 2 +- lib/mbtowc-impl.h | 2 +- lib/mbtowc.c | 2 +- lib/memchr.c | 2 +- lib/ref-add.sin | 2 +- lib/ref-del.sin | 2 +- lib/stdbool.in.h | 53 +- lib/stddef.in.h | 2 +- lib/stdint.in.h | 7 +- lib/stdio.in.h | 40 +- lib/stdlib.in.h | 40 +- lib/str-two-way.h | 2 +- lib/streq.h | 2 +- lib/striconv.c | 2 +- lib/striconv.h | 2 +- lib/string.in.h | 2 +- lib/strnlen1.c | 2 +- lib/strnlen1.h | 2 +- lib/strstr.c | 2 +- lib/sys_stat.in.h | 8 +- lib/sys_time.in.h | 206 +-- lib/sys_types.in.h | 4 +- lib/time.in.h | 46 +- lib/unistd.c | 3 + lib/unistd.in.h | 66 +- lib/unistr.in.h | 2 +- lib/unistr/u8-mbtoucr.c | 2 +- lib/unistr/u8-uctomb-aux.c | 2 +- lib/unistr/u8-uctomb.c | 2 +- lib/unitypes.in.h | 2 +- lib/verify.h | 142 +- lib/wchar.in.h | 2 +- lib/wcrtomb.c | 2 +- lib/wcsdup-impl.h | 2 +- lib/wcsdup.c | 2 +- lib/wctob.c | 2 +- lib/wctomb-impl.h | 2 +- lib/wctomb.c | 2 +- lib/wctype-h.c | 4 + lib/wctype.in.h | 50 +- lib/wmemcpy-impl.h | 2 +- lib/wmemcpy.c | 2 +- m4/00gnulib.m4 | 22 +- m4/Makefile.in | 130 +- m4/absolute-header.m4 | 102 ++ m4/assert.m4 | 2 +- m4/btowc.m4 | 2 +- m4/codeset.m4 | 2 +- m4/config-h.m4 | 2 +- m4/configmake.m4 | 13 +- m4/extensions.m4 | 51 +- m4/extern-inline.m4 | 84 + m4/fcntl-o.m4 | 15 +- m4/getopt.m4 | 299 ++-- m4/gettext.m4 | 6 +- m4/gettimeofday.m4 | 10 +- m4/glibc2.m4 | 2 +- m4/glibc21.m4 | 2 +- m4/gnulib-common.m4 | 75 +- m4/gnulib-comp.m4 | 314 ++-- m4/gnulib-tool.m4 | 2 +- m4/iconv.m4 | 2 +- m4/iconv_h.m4 | 2 +- m4/iconv_open.m4 | 2 +- m4/include_next.m4 | 55 +- m4/inline.m4 | 2 +- m4/intdiv0.m4 | 6 +- m4/intl.m4 | 45 +- m4/intldir.m4 | 2 +- m4/intlmacosx.m4 | 14 +- m4/intmax.m4 | 2 +- m4/inttypes-pri.m4 | 2 +- m4/inttypes_h.m4 | 2 +- m4/lcmessage.m4 | 2 +- m4/lib-ld.m4 | 60 +- m4/lib-link.m4 | 2 +- m4/lib-prefix.m4 | 2 +- m4/libunistring-base.m4 | 2 +- m4/localcharset.m4 | 2 +- m4/locale-fr.m4 | 12 +- m4/locale-ja.m4 | 8 +- m4/locale-zh.m4 | 8 +- m4/locale_h.m4 | 6 +- m4/lock.m4 | 15 +- m4/longlong.m4 | 2 +- m4/mbrtowc.m4 | 48 +- m4/mbsinit.m4 | 2 +- m4/mbsrtowcs.m4 | 2 +- m4/mbstate_t.m4 | 2 +- m4/mbtowc.m4 | 2 +- m4/memchr.m4 | 2 +- m4/mmap-anon.m4 | 14 +- m4/multiarch.m4 | 6 +- m4/nls.m4 | 2 +- m4/nocrash.m4 | 6 +- m4/off_t.m4 | 2 +- m4/po.m4 | 13 +- m4/printf-posix.m4 | 2 +- m4/progtest.m4 | 2 +- m4/size_max.m4 | 2 +- m4/ssize_t.m4 | 2 +- m4/stdbool.m4 | 2 +- m4/stddef_h.m4 | 2 +- m4/stdint.m4 | 2 +- m4/stdint_h.m4 | 2 +- m4/stdio_h.m4 | 7 +- m4/stdlib_h.m4 | 9 +- m4/string_h.m4 | 2 +- m4/strstr.m4 | 2 +- m4/sys_socket_h.m4 | 5 +- m4/sys_stat_h.m4 | 7 +- m4/sys_time_h.m4 | 10 +- m4/sys_types_h.m4 | 6 +- m4/threadlib.m4 | 56 +- m4/time_h.m4 | 15 +- m4/uintmax_t.m4 | 2 +- m4/unistd_h.m4 | 6 +- m4/visibility.m4 | 6 +- m4/warn-on-use.m4 | 2 +- m4/wchar_h.m4 | 2 +- m4/wchar_t.m4 | 2 +- m4/wcrtomb.m4 | 2 +- m4/wcsdup.m4 | 2 +- m4/wctob.m4 | 2 +- m4/wctomb.m4 | 2 +- m4/wctype_h.m4 | 6 +- m4/wint_t.m4 | 2 +- m4/wmemcpy.m4 | 2 +- m4/xsize.m4 | 5 +- src/Makefile.in | 381 +++-- 173 files changed, 4419 insertions(+), 4008 deletions(-) create mode 100644 lib/crc.c create mode 100644 lib/crc.h delete mode 100644 lib/iconv_open-aix.h delete mode 100644 lib/iconv_open-hpux.h delete mode 100644 lib/iconv_open-irix.h delete mode 100644 lib/iconv_open-osf.h delete mode 100644 lib/iconv_open-solaris.h create mode 100644 lib/unistd.c create mode 100644 lib/wctype-h.c create mode 100644 m4/absolute-header.m4 create mode 100644 m4/extern-inline.m4 diff --git a/Makefile.in b/Makefile.in index 5e7cc8b..bd58e00 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,12 +17,12 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2012, John Zaitseff # +# Copyright (C) 1990-2014, John Zaitseff # # # ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 362 2012-03-14 15:36:23Z john $ +# $Id: Makefile.am 514 2014-05-22 01:05:51Z john $ # # This file, Makefile.am, contains the top-level Makefile for Star # Traders. It needs to be processed by automake to produce the @@ -43,23 +42,51 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -78,23 +105,32 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure COPYING INSTALL NEWS build-aux/README \ - build-aux/compile build-aux/config.guess \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in COPYING INSTALL NEWS README \ + build-aux/README build-aux/compile build-aux/config.guess \ build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ - build-aux/install-sh build-aux/missing + build-aux/install-sh build-aux/missing \ + $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.rpath \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/assert.m4 $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/assert.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ $(top_srcdir)/m4/ax_c___attribute__.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/ax_with_curses.m4 $(top_srcdir)/m4/btowc.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \ @@ -131,15 +167,28 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -147,11 +196,33 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -162,6 +233,7 @@ am__remove_distdir = \ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -189,6 +261,7 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_TARGETS = dist-bzip2 dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -196,6 +269,7 @@ distcleancheck_listfiles = find . -type f -print pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ @@ -371,6 +445,7 @@ GNULIB_RENAMEAT = @GNULIB_RENAMEAT@ GNULIB_RMDIR = @GNULIB_RMDIR@ GNULIB_RPMATCH = @GNULIB_RPMATCH@ GNULIB_SCANF = @GNULIB_SCANF@ +GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ @@ -576,6 +651,7 @@ HAVE_READLINKAT = @HAVE_READLINKAT@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ +HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -760,11 +836,13 @@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ +REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ICONV = @REPLACE_ICONV@ REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@ REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@ @@ -775,6 +853,7 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ +REPLACE_LOCALTIME = @REPLACE_LOCALTIME@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ @@ -800,6 +879,7 @@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ +REPLACE_PTSNAME = @REPLACE_PTSNAME@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ @@ -859,6 +939,7 @@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -929,6 +1010,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -986,8 +1068,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -1001,22 +1083,25 @@ distclean-hdr: -rm -f config.h stamp-h1 # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -1031,57 +1116,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -1097,12 +1137,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1114,15 +1149,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1131,9 +1162,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -1201,40 +1254,41 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' 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 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -1245,8 +1299,6 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -1258,18 +1310,19 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1292,7 +1345,7 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -1426,13 +1479,12 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ distcheck distclean distclean-generic distclean-hdr \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ @@ -1442,8 +1494,8 @@ uninstall-am: install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs installdirs-am \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/aclocal.m4 b/aclocal.m4 index b0feba5..a45a374 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.5 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,33 +11,31 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, [m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' 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.11.5], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -54,24 +51,22 @@ 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.11.5])dnl +[AM_AUTOMAKE_VERSION([1.14.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, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -90,7 +85,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -116,22 +111,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -150,16 +142,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -169,7 +159,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -182,12 +172,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -195,8 +186,8 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -236,16 +227,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -254,8 +245,8 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -263,7 +254,7 @@ AC_CACHE_CHECK([dependency style of $depcc], fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -311,7 +302,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -321,9 +312,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -338,20 +333,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -364,7 +357,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -376,21 +369,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -408,7 +399,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -418,18 +409,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -442,7 +436,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -471,31 +465,40 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -506,34 +509,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -555,15 +602,12 @@ 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, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -577,16 +621,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -602,14 +644,12 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -627,7 +667,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -652,52 +692,14 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -705,11 +707,10 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -722,54 +723,22 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -779,7 +748,7 @@ AC_DEFUN([_AM_MANGLE_OPTION], # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -793,24 +762,82 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -821,32 +848,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -856,46 +891,118 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -909,18 +1016,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -930,91 +1035,132 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([m4/00gnulib.m4]) +m4_include([m4/absolute-header.m4]) m4_include([m4/assert.m4]) m4_include([m4/ax_append_flag.m4]) m4_include([m4/ax_c___attribute__.m4]) m4_include([m4/ax_cflags_warn_all.m4]) +m4_include([m4/ax_require_defined.m4]) m4_include([m4/ax_with_curses.m4]) m4_include([m4/btowc.m4]) m4_include([m4/codeset.m4]) m4_include([m4/config-h.m4]) m4_include([m4/configmake.m4]) m4_include([m4/extensions.m4]) +m4_include([m4/extern-inline.m4]) m4_include([m4/fcntl-o.m4]) m4_include([m4/getopt.m4]) m4_include([m4/gettext.m4]) diff --git a/build-aux/config.rpath b/build-aux/config.rpath index 1a07018..ab6fd99 100755 --- a/build-aux/config.rpath +++ b/build-aux/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2012 Free Software Foundation, Inc. +# Copyright 1996-2014 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # diff --git a/build-aux/snippet/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h index 3a9dd26..9ee8b15 100644 --- a/build-aux/snippet/arg-nonnull.h +++ b/build-aux/snippet/arg-nonnull.h @@ -1,5 +1,5 @@ /* A C macro for declaring that specific arguments must not be NULL. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/build-aux/snippet/c++defs.h b/build-aux/snippet/c++defs.h index 96da94b..67b1233 100644 --- a/build-aux/snippet/c++defs.h +++ b/build-aux/snippet/c++defs.h @@ -1,5 +1,5 @@ /* C++ compatible function declaration macros. - Copyright (C) 2010-2012 Free Software Foundation, Inc. + Copyright (C) 2010-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/build-aux/snippet/unused-parameter.h b/build-aux/snippet/unused-parameter.h index 1c8d61f..41d9510 100644 --- a/build-aux/snippet/unused-parameter.h +++ b/build-aux/snippet/unused-parameter.h @@ -1,5 +1,5 @@ /* A C macro for declaring that specific function parameters are not used. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/build-aux/snippet/warn-on-use.h b/build-aux/snippet/warn-on-use.h index d4cb94f..1c4d7bd 100644 --- a/build-aux/snippet/warn-on-use.h +++ b/build-aux/snippet/warn-on-use.h @@ -1,5 +1,5 @@ /* A C macro for emitting warnings if a function is used. - Copyright (C) 2010-2012 Free Software Foundation, Inc. + Copyright (C) 2010-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -55,7 +55,7 @@ rather than issue the nice warning, but the end result of informing the developer about their portability problem is still achieved): #if HAVE_RAW_DECL_ENVIRON - static inline char ***rpl_environ (void) { return &environ; } + static char ***rpl_environ (void) { return &environ; } _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); # undef environ # define environ (*rpl_environ ()) diff --git a/config.h.in b/config.h.in index 97137e4..188881b 100644 --- a/config.h.in +++ b/config.h.in @@ -26,6 +26,14 @@ declaration of the second argument to gettimeofday. */ #undef GETTIMEOFDAY_TIMEZONE +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module fscanf shall be considered present. */ +#undef GNULIB_FSCANF + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module scanf shall be considered present. */ +#undef GNULIB_SCANF + /* Define to 1 when the gnulib module btowc should be tested. */ #undef GNULIB_TEST_BTOWC @@ -82,11 +90,11 @@ /* Define to 1 if you have the `btowc' function. */ #undef HAVE_BTOWC -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework. */ #undef HAVE_CFLOCALECOPYCURRENT -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework. */ #undef HAVE_CFPREFERENCESCOPYAPPVALUE @@ -493,6 +501,9 @@ /* Define to 1 if rpmatch is declared even after undefining macros. */ #undef HAVE_RAW_DECL_RPMATCH +/* Define to 1 if secure_getenv is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_SECURE_GETENV + /* Define to 1 if setenv is declared even after undefining macros. */ #undef HAVE_RAW_DECL_SETENV @@ -833,6 +844,10 @@ /* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */ #undef MAP_ANONYMOUS +/* Define if the mbrtowc function does not return (size_t) -2 for empty input. + */ +#undef MBRTOWC_EMPTY_INPUT_BUG + /* Define if the mbrtowc function has the NULL pwc argument bug. */ #undef MBRTOWC_NULL_ARG1_BUG @@ -848,9 +863,6 @@ /* Define to 1 if assertions should be disabled. */ #undef NDEBUG -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE @@ -893,6 +905,38 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on OS X. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions if necessary. HP-UX 11.11 defines + mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of + whether compiling with -Ae or -D_HPUX_SOURCE=1. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + /* Version number of package */ #undef VERSION @@ -914,8 +958,12 @@ /* Define to 1 if on MINIX. */ #undef _MINIX +/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */ +#undef _NETBSD_SOURCE + /* The _Noreturn keyword of C11. */ -#if !defined _Noreturn && __STDC_VERSION__ < 201112 +#if ! (defined _Noreturn \ + || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ || 0x5110 <= __SUNPRO_C) # define _Noreturn __attribute__ ((__noreturn__)) @@ -934,41 +982,83 @@ /* Define to 1 if you need to in order for 'stat' and other things to work. */ #undef _POSIX_SOURCE -/* Define to 500 only on HP-UX. */ -#undef _XOPEN_SOURCE - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE -#endif -/* Enable general extensions on MacOS X. */ -#ifndef _DARWIN_C_SOURCE -# undef _DARWIN_C_SOURCE -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif - - /* Define to rpl_ if the getopt replacement functions and variables should be used. */ #undef __GETOPT_PREFIX -/* Define to rpl_gmtime if the replacement function should be used. */ -#undef gmtime +/* Please see the Gnulib manual for how to use these macros. + + Suppress extern inline with HP-UX cc, as it appears to be broken; see + . + + Suppress extern inline with Sun C in standards-conformance mode, as it + mishandles inline functions that call each other. E.g., for 'inline void f + (void) { } inline void g (void) { f (); }', c99 incorrectly complains + 'reference to static identifier "f" in extern inline function'. + This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. + + Suppress the use of extern inline on problematic Apple configurations. + OS X 10.8 and earlier mishandle it; see, e.g., + . + OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and + for clang but remains for g++; see . + Perhaps Apple will fix this some day. */ +#if (defined __APPLE__ \ + && (defined __header_inline \ + ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ + && ! defined __clang__) \ + : ((! defined _DONT_USE_CTYPE_INLINE_ \ + && (defined __GNUC__ || defined __cplusplus)) \ + || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ + && defined __GNUC__ && ! defined __cplusplus)))) +# define _GL_EXTERN_INLINE_APPLE_BUG +#endif +#if ((__GNUC__ \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ + : (199901L <= __STDC_VERSION__ \ + && !defined __HP_cc \ + && !(defined __SUNPRO_C && __STDC__))) \ + && !defined _GL_EXTERN_INLINE_APPLE_BUG) +# define _GL_INLINE inline +# define _GL_EXTERN_INLINE extern inline +# define _GL_EXTERN_INLINE_IN_USE +#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ + && !defined _GL_EXTERN_INLINE_APPLE_BUG) +# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ + /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ +# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) +# else +# define _GL_INLINE extern inline +# endif +# define _GL_EXTERN_INLINE extern +# define _GL_EXTERN_INLINE_IN_USE +#else +# define _GL_INLINE static _GL_UNUSED +# define _GL_EXTERN_INLINE static _GL_UNUSED +#endif + +#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ +# define _GL_INLINE_HEADER_CONST_PRAGMA +# else +# define _GL_INLINE_HEADER_CONST_PRAGMA \ + _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") +# endif + /* Suppress GCC's bogus "no previous prototype for 'FOO'" + and "no previous declaration for 'FOO'" diagnostics, + when FOO is an inline function in the header; see + . */ +# define _GL_INLINE_HEADER_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \ + _GL_INLINE_HEADER_CONST_PRAGMA +# define _GL_INLINE_HEADER_END \ + _Pragma ("GCC diagnostic pop") +#else +# define _GL_INLINE_HEADER_BEGIN +# define _GL_INLINE_HEADER_END +#endif /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ @@ -979,16 +1069,13 @@ /* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. - __APPLE__ && __MACH__ test for MacOS X. + __APPLE__ && __MACH__ test for Mac OS X. __APPLE_CC__ tests for the Apple compiler and its version. __STDC_VERSION__ tests for the C99 mode. */ #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ # define __GNUC_STDC_INLINE__ 1 #endif -/* Define to rpl_localtime if the replacement function should be used. */ -#undef localtime - /* Define to a type if does not define. */ #undef mbstate_t diff --git a/configure b/configure index 438339d..e9e342c 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.4. +# Generated by GNU Autoconf 2.69 for Star Traders 7.5. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Star Traders' PACKAGE_TARNAME='trader' -PACKAGE_VERSION='7.4' -PACKAGE_STRING='Star Traders 7.4' +PACKAGE_VERSION='7.5' +PACKAGE_STRING='Star Traders 7.5' PACKAGE_BUGREPORT='J.Zaitseff@zap.org.au' PACKAGE_URL='http://www.zap.org.au/software/trader/' @@ -673,6 +673,8 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC TIME_H_DEFINES_STRUCT_TIMESPEC NEXT_AS_FIRST_DIRECTIVE_TIME_H NEXT_TIME_H +REPLACE_LOCALTIME +REPLACE_GMTIME REPLACE_TIMEGM REPLACE_NANOSLEEP REPLACE_MKTIME @@ -945,6 +947,7 @@ REPLACE_REALLOC REPLACE_RANDOM_R REPLACE_PUTENV REPLACE_PTSNAME_R +REPLACE_PTSNAME REPLACE_MKSTEMP REPLACE_MBTOWC REPLACE_MALLOC @@ -959,6 +962,7 @@ HAVE_STRTOLL HAVE_STRTOD HAVE_DECL_SETENV HAVE_SETENV +HAVE_SECURE_GETENV HAVE_RPMATCH HAVE_REALPATH HAVE_RANDOM_R @@ -986,6 +990,7 @@ GNULIB_STRTOULL GNULIB_STRTOLL GNULIB_STRTOD GNULIB_SETENV +GNULIB_SECURE_GETENV GNULIB_RPMATCH GNULIB_REALPATH GNULIB_REALLOC_POSIX @@ -1082,6 +1087,7 @@ REPLACE_ISATTY REPLACE_GETPAGESIZE REPLACE_GETGROUPS REPLACE_GETLOGIN_R +REPLACE_GETDTABLESIZE REPLACE_GETDOMAINNAME REPLACE_GETCWD REPLACE_FTRUNCATE @@ -1181,6 +1187,7 @@ GNULIB_CLOSE GNULIB_CHOWN GNULIB_CHDIR pkglibexecdir +runstatedir lispdir LOCALE_FR REPLACE_WCSWIDTH @@ -1283,6 +1290,14 @@ INTLLIBS LTLIBICONV LIBICONV INTL_MACOSX_LIBS +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build XGETTEXT_EXTRA_OPTIONS MSGMERGE XGETTEXT_015 @@ -1293,14 +1308,7 @@ GMSGFMT MSGFMT GETTEXT_MACRO_VERSION USE_NLS -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build +SED RANLIB ARFLAGS AR @@ -1324,6 +1332,10 @@ CPPFLAGS LDFLAGS CFLAGS CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -1388,6 +1400,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_dependency_tracking enable_nls with_gnu_ld @@ -1948,7 +1961,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.4 to adapt to many kinds of systems. +\`configure' configures Star Traders 7.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2018,7 +2031,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Star Traders 7.4:";; + short | recursive ) echo "Configuration of Star Traders 7.5:";; esac cat <<\_ACEOF @@ -2026,8 +2039,12 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths --disable-assert turn off assertions @@ -2035,7 +2052,7 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-gnu-ld assume the C compiler uses GNU ld default=no + --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib @@ -2121,7 +2138,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Star Traders configure 7.4 +Star Traders configure 7.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2773,7 +2790,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.4, which was +It was created by Star Traders $as_me 7.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3183,7 +3200,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ac_config_headers="$ac_config_headers config.h" -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3280,9 +3297,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -3293,32 +3307,40 @@ case `pwd` in esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -3330,6 +3352,16 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -3352,12 +3384,12 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -3369,10 +3401,10 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -3511,13 +3543,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } - -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -3600,6 +3625,45 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3622,7 +3686,7 @@ fi # Define the identity of the package. PACKAGE='trader' - VERSION='7.4' + VERSION='7.5' cat >>confdefs.h <<_ACEOF @@ -3650,12 +3714,22 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3663,6 +3737,48 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4452,6 +4568,65 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -4471,7 +4646,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -4527,8 +4702,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -4563,16 +4738,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4581,8 +4756,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -4590,7 +4765,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -5335,202 +5510,6 @@ fi fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } @@ -5662,8 +5641,6 @@ done - - ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" if test "x$ac_cv_header_minix_config_h" = xyes; then : MINIX=yes @@ -5682,16 +5659,11 @@ $as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h $as_echo "#define _MINIX 1" >>confdefs.h + +$as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h + fi - case "$host_os" in - hpux*) - -$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h - - ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } @@ -5733,6 +5705,53 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +$as_echo_n "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if ${ac_cv_should_define__xopen_source+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_should_define__xopen_source=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +$as_echo "$ac_cv_should_define__xopen_source" >&6; } + test $ac_cv_should_define__xopen_source = yes && + $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h @@ -5743,14 +5762,18 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } + + # Code from module absolute-header: # Code from module assert: # Code from module btowc: # 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: @@ -5844,6 +5867,8 @@ CFLAGS="$ac_save_CFLAGS" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_warn_all" >&5 $as_echo "$ac_cv_cflags_warn_all" >&6; } + + case ".$ac_cv_cflags_warn_all" in .ok|.ok,*) ;; .|.no|.no,*) ;; @@ -5941,6 +5966,75 @@ _ACEOF fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } @@ -6254,6 +6348,78 @@ fi eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" prefix="$acl_save_prefix" +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + + # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : @@ -6274,11 +6440,12 @@ if test "${PATH_SEPARATOR+set}" != set; then || PATH_SEPARATOR=';' } fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 -$as_echo_n "checking for ld used by GCC... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -6288,11 +6455,11 @@ $as_echo_n "checking for ld used by GCC... " >&6; } esac case $ac_prog in # Accept absolute paths. - [\\/]* | [A-Za-z]:[\\/]*) + [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" @@ -6317,23 +6484,26 @@ if ${acl_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do + IFS="$acl_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + case `"$acl_cv_path_LD" -v 2>&1 &6; } if ${acl_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 @@ -8260,7 +8432,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -8319,7 +8491,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -8361,6 +8533,9 @@ $as_echo "$gt_cv_locale_fr" >&6; } + + + GNULIB_CHDIR=0; GNULIB_CHOWN=0; GNULIB_CLOSE=0; @@ -8459,6 +8634,7 @@ $as_echo "$gt_cv_locale_fr" >&6; } REPLACE_FTRUNCATE=0; REPLACE_GETCWD=0; REPLACE_GETDOMAINNAME=0; + REPLACE_GETDTABLESIZE=0; REPLACE_GETLOGIN_R=0; REPLACE_GETGROUPS=0; REPLACE_GETPAGESIZE=0; @@ -8641,36 +8817,40 @@ else if test $ac_cv_header_getopt_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'getopt.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'getopt.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_getopt_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_getopt_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_getopt_h + gl_cv_next_getopt_h='"'$gl_header'"' else gl_cv_next_getopt_h='<'getopt.h'>' fi @@ -8736,57 +8916,19 @@ done fi - if test -z "$gl_replace_getopt"; then + if test -z "$gl_replace_getopt"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getopt is POSIX compatible" >&5 $as_echo_n "checking whether getopt is POSIX compatible... " >&6; } if ${gl_cv_func_getopt_posix+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -int *p = &optreset; return optreset; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gl_optind_min=1 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -return !getopt_clip; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_optind_min=1 -else - gl_optind_min=0 -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - gl_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -DOPTIND_MIN=$gl_optind_min" - if test "$cross_compiling" = yes; then : - case "$host_os" in - mingw*) gl_cv_func_getopt_posix="guessing no";; - darwin* | aix*) gl_cv_func_getopt_posix="guessing no";; - *) gl_cv_func_getopt_posix="guessing yes";; - esac - + if test $cross_compiling = no; then + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8798,78 +8940,122 @@ else int main () { - { - static char program[] = "program"; - static char a[] = "-a"; - static char foo[] = "foo"; - static char bar[] = "bar"; - char *argv[] = { program, a, foo, bar, NULL }; - int c; + static char program[] = "program"; + static char a[] = "-a"; + static char foo[] = "foo"; + static char bar[] = "bar"; + char *argv[] = { program, a, foo, bar, NULL }; + int c; - optind = OPTIND_MIN; - opterr = 0; + c = getopt (4, argv, "ab"); + if (!(c == 'a')) + return 1; + c = getopt (4, argv, "ab"); + if (!(c == -1)) + return 2; + if (!(optind == 2)) + return 3; + return 0; +} - c = getopt (4, argv, "ab"); - if (!(c == 'a')) - return 1; - c = getopt (4, argv, "ab"); - if (!(c == -1)) - return 2; - if (!(optind == 2)) - return 3; - } - /* Some internal state exists at this point. */ - { - static char program[] = "program"; - static char donald[] = "donald"; - static char p[] = "-p"; - static char billy[] = "billy"; - static char duck[] = "duck"; - static char a[] = "-a"; - static char bar[] = "bar"; - char *argv[] = { program, donald, p, billy, duck, a, bar, NULL }; - int c; +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_getopt_posix=maybe +else + gl_cv_func_getopt_posix=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi - optind = OPTIND_MIN; - opterr = 0; + if test $gl_cv_func_getopt_posix = maybe; then + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - c = getopt (7, argv, "+abp:q:"); - if (!(c == -1)) - return 4; - if (!(strcmp (argv[0], "program") == 0)) - return 5; - if (!(strcmp (argv[1], "donald") == 0)) - return 6; - if (!(strcmp (argv[2], "-p") == 0)) - return 7; - if (!(strcmp (argv[3], "billy") == 0)) - return 8; - if (!(strcmp (argv[4], "duck") == 0)) - return 9; - if (!(strcmp (argv[5], "-a") == 0)) - return 10; - if (!(strcmp (argv[6], "bar") == 0)) - return 11; - if (!(optind == 1)) - return 12; - } - /* Detect MacOS 10.5, AIX 7.1 bug. */ - { - static char program[] = "program"; - static char ab[] = "-ab"; - char *argv[3] = { program, ab, NULL }; - optind = OPTIND_MIN; - opterr = 0; - if (getopt (2, argv, "ab:") != 'a') - return 13; - if (getopt (2, argv, "ab:") != '?') - return 14; - if (optopt != 'b') - return 15; - if (optind != 2) - return 16; - } +#include +#include +#include +int +main () +{ + static char program[] = "program"; + static char donald[] = "donald"; + static char p[] = "-p"; + static char billy[] = "billy"; + static char duck[] = "duck"; + static char a[] = "-a"; + static char bar[] = "bar"; + char *argv[] = { program, donald, p, billy, duck, a, bar, NULL }; + int c; + + c = getopt (7, argv, "+abp:q:"); + if (!(c == -1)) + return 4; + if (!(strcmp (argv[0], "program") == 0)) + return 5; + if (!(strcmp (argv[1], "donald") == 0)) + return 6; + if (!(strcmp (argv[2], "-p") == 0)) + return 7; + if (!(strcmp (argv[3], "billy") == 0)) + return 8; + if (!(strcmp (argv[4], "duck") == 0)) + return 9; + if (!(strcmp (argv[5], "-a") == 0)) + return 10; + if (!(strcmp (argv[6], "bar") == 0)) + return 11; + if (!(optind == 1)) + return 12; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_getopt_posix=maybe +else + gl_cv_func_getopt_posix=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + fi + if test $gl_cv_func_getopt_posix = maybe; then + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include + +int +main () +{ + static char program[] = "program"; + static char ab[] = "-ab"; + char *argv[3] = { program, ab, NULL }; + if (getopt (2, argv, "ab:") != 'a') + return 13; + if (getopt (2, argv, "ab:") != '?') + return 14; + if (optopt != 'b') + return 15; + if (optind != 2) + return 16; return 0; } @@ -8883,7 +9069,13 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - CPPFLAGS=$gl_save_CPPFLAGS + fi + else + case "$host_os" in + darwin* | aix* | mingw*) gl_cv_func_getopt_posix="guessing no";; + *) gl_cv_func_getopt_posix="guessing yes";; + esac + fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_posix" >&5 @@ -8914,11 +9106,7 @@ else POSIXLY_CORRECT=1 export POSIXLY_CORRECT if test "$cross_compiling" = yes; then : - case $host_os:$ac_cv_have_decl_optreset in - *-gnu*:* | mingw*:*) gl_cv_func_getopt_gnu=no;; - *:yes) gl_cv_func_getopt_gnu=no;; - *) gl_cv_func_getopt_gnu=yes;; - esac + gl_cv_func_getopt_gnu="guessing no" else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8929,7 +9117,7 @@ else #include #if defined __MACH__ && defined __APPLE__ -/* Avoid a crash on MacOS X. */ +/* Avoid a crash on Mac OS X. */ #include #include #include @@ -9049,7 +9237,7 @@ main () nocrash_init(); /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw, - and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, + and fails on Mac OS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10. */ { static char conftest[] = "conftest"; @@ -9060,7 +9248,7 @@ main () result |= 1; } /* This code succeeds on glibc 2.8, mingw, - and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11, + and fails on Mac OS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x. */ { static char program[] = "program"; @@ -9089,7 +9277,7 @@ main () if (getopt (3, argv, "-p") != 1) result |= 16; else if (getopt (3, argv, "-p") != 'p') - result |= 32; + result |= 16; } /* This code fails on glibc 2.11. */ { @@ -9099,9 +9287,9 @@ main () char *argv[] = { program, b, a, NULL }; optind = opterr = 0; if (getopt (3, argv, "+:a:b") != 'b') - result |= 64; + result |= 32; else if (getopt (3, argv, "+:a:b") != ':') - result |= 64; + result |= 32; } /* This code dumps core on glibc 2.14. */ { @@ -9111,7 +9299,7 @@ main () char *argv[] = { program, w, dummy, NULL }; optind = opterr = 1; if (getopt (3, argv, "W;") != 'W') - result |= 128; + result |= 64; } return result; @@ -9137,8 +9325,71 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_gnu" >&5 $as_echo "$gl_cv_func_getopt_gnu" >&6; } - if test "$gl_cv_func_getopt_gnu" = "no"; then + if test "$gl_cv_func_getopt_gnu" != yes; then gl_replace_getopt=yes + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt_long function" >&5 +$as_echo_n "checking for working GNU getopt_long function... " >&6; } +if ${gl_cv_func_getopt_long_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + case "$host_os" in + openbsd*) gl_cv_func_getopt_long_gnu="guessing no";; + *) gl_cv_func_getopt_long_gnu="guessing yes";; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + #include + +int +main () +{ +static const struct option long_options[] = + { + { "xtremely-",no_argument, NULL, 1003 }, + { "xtra", no_argument, NULL, 1001 }, + { "xtreme", no_argument, NULL, 1002 }, + { "xtremely", no_argument, NULL, 1003 }, + { NULL, 0, NULL, 0 } + }; + /* This code fails on OpenBSD 5.0. */ + { + static char program[] = "program"; + static char xtremel[] = "--xtremel"; + char *argv[] = { program, xtremel, NULL }; + int option_index; + optind = 1; opterr = 0; + if (getopt_long (2, argv, "", long_options, &option_index) != 1003) + return 1; + } + return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_getopt_long_gnu=yes +else + gl_cv_func_getopt_long_gnu=no +fi +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_getopt_long_gnu" >&5 +$as_echo "$gl_cv_func_getopt_long_gnu" >&6; } + case "$gl_cv_func_getopt_long_gnu" in + *yes) ;; + *) gl_replace_getopt=yes ;; + esac fi fi @@ -9146,15 +9397,11 @@ $as_echo "$gl_cv_func_getopt_gnu" >&6; } + REPLACE_GETOPT=0 - - - if test -n "$gl_replace_getopt"; then : - + if test -n "$gl_replace_getopt"; then REPLACE_GETOPT=1 - -fi - + fi if test $REPLACE_GETOPT = 1; then @@ -9260,36 +9507,40 @@ else if test $ac_cv_header_sys_time_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'sys/time.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'sys/time.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_sys_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_sys_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_sys_time_h + gl_cv_next_sys_time_h='"'$gl_header'"' else gl_cv_next_sys_time_h='<'sys/time.h'>' fi @@ -9381,8 +9632,8 @@ $as_echo "$gl_cv_sys_struct_timeval" >&6; } if test $gl_cv_sys_struct_timeval != yes; then HAVE_STRUCT_TIMEVAL=0 else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct struct timeval.tv_sec member" >&5 -$as_echo_n "checking for correct struct timeval.tv_sec member... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wide-enough struct timeval.tv_sec member" >&5 +$as_echo_n "checking for wide-enough struct timeval.tv_sec member... " >&6; } if ${gl_cv_sys_struct_timeval_tv_sec+:} false; then : $as_echo_n "(cached) " >&6 else @@ -9400,7 +9651,9 @@ int main () { static struct timeval x; - typedef int verify_tv_sec_type[sizeof (x.tv_sec) == sizeof (time_t) ? 1 : -1]; + typedef int verify_tv_sec_type[ + sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1 + ]; ; return 0; @@ -9886,7 +10139,18 @@ main () #if HAVE_SYMLINK { static char const sym[] = "conftest.sym"; - if (symlink (".", sym) != 0) + if (symlink ("/dev/null", sym) != 0) + result |= 2; + else + { + int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0); + if (fd >= 0) + { + close (fd); + result |= 4; + } + } + if (unlink (sym) != 0 || symlink (".", sym) != 0) result |= 2; else { @@ -10137,36 +10401,40 @@ if ${gl_cv_next_stddef_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'stddef.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'stddef.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_stddef_h + gl_cv_next_stddef_h='"'$gl_header'"' fi @@ -10277,7 +10545,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -10333,7 +10601,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the AIX locale name. @@ -10417,7 +10685,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -10482,7 +10750,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the locale name without encoding suffix. @@ -10550,7 +10818,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; # endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -10609,7 +10877,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -10666,6 +10934,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; } GNULIB_REALLOC_POSIX=0; GNULIB_REALPATH=0; GNULIB_RPMATCH=0; + GNULIB_SECURE_GETENV=0; GNULIB_SETENV=0; GNULIB_STRTOD=0; GNULIB_STRTOLL=0; @@ -10693,6 +10962,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; } HAVE_RANDOM_R=1; HAVE_REALPATH=1; HAVE_RPMATCH=1; + HAVE_SECURE_GETENV=1; HAVE_SETENV=1; HAVE_DECL_SETENV=1; HAVE_STRTOD=1; @@ -10707,6 +10977,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; } REPLACE_MALLOC=0; REPLACE_MBTOWC=0; REPLACE_MKSTEMP=0; + REPLACE_PTSNAME=0; REPLACE_PTSNAME_R=0; REPLACE_PUTENV=0; REPLACE_RANDOM_R=0; @@ -10821,12 +11092,12 @@ $as_echo_n "checking for MAP_ANONYMOUS... " >&6; } #include #ifdef MAP_ANONYMOUS - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : gl_have_mmap_anonymous=yes fi rm -f conftest* @@ -10837,12 +11108,12 @@ rm -f conftest* #include #ifdef MAP_ANON - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : $as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h @@ -11263,36 +11534,40 @@ else if test $ac_cv_header_stdint_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'stdint.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'stdint.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_stdint_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_stdint_h + gl_cv_next_stdint_h='"'$gl_header'"' else gl_cv_next_stdint_h='<'stdint.h'>' fi @@ -12051,36 +12326,40 @@ if ${gl_cv_next_string_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'string.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'string.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_string_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_string_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_string_h + gl_cv_next_string_h='"'$gl_header'"' fi @@ -12332,6 +12611,86 @@ fi + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_sys_types_h='<'sys/types.h'>' + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_sys_types_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'sys/types.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_sys_types_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_sys_types_h + gl_cv_next_sys_types_h='"'$gl_header'"' + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5 +$as_echo "$gl_cv_next_sys_types_h" >&6; } + fi + NEXT_SYS_TYPES_H=$gl_cv_next_sys_types_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'sys/types.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_sys_types_h + fi + NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H=$gl_next_as_first_directive + + + + + + + + + + + + GNULIB_MKTIME=0; GNULIB_NANOSLEEP=0; GNULIB_STRPTIME=0; @@ -12346,6 +12705,10 @@ fi REPLACE_NANOSLEEP=GNULIB_PORTCHECK; REPLACE_TIMEGM=GNULIB_PORTCHECK; + : ${GNULIB_GETTIMEOFDAY=0}; + REPLACE_GMTIME=0; + REPLACE_LOCALTIME=0; + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in " >&5 @@ -12465,36 +12828,40 @@ if ${gl_cv_next_time_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'time.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'time.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_time_h + gl_cv_next_time_h='"'$gl_header'"' fi @@ -12789,7 +13156,7 @@ $as_echo "$gl_cv_func_btowc_eof" >&6; } esac fi -if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then + if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then @@ -12803,7 +13170,7 @@ if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then : -fi + fi @@ -12852,6 +13219,10 @@ $as_echo "#define GNULIB_TEST_BTOWC 1" >>confdefs.h if test "x$localedir" = x; then localedir='${datarootdir}/locale' + fi + if test "x$runstatedir" = x; then + runstatedir='${localstatedir}/run' + fi pkglibexecdir='${libexecdir}/${PACKAGE}' @@ -12862,7 +13233,8 @@ $as_echo "#define GNULIB_TEST_BTOWC 1" >>confdefs.h -if test $REPLACE_GETOPT = 1; then + + if test $REPLACE_GETOPT = 1; then @@ -12886,8 +13258,8 @@ if test $REPLACE_GETOPT = 1; then - GNULIB_GL_UNISTD_H_GETOPT=1 -fi + GNULIB_GL_UNISTD_H_GETOPT=1 + fi @@ -12898,15 +13270,11 @@ $as_echo "#define GNULIB_TEST_GETOPT_GNU 1" >>confdefs.h + REPLACE_GETOPT=0 - - - if test -n "$gl_replace_getopt"; then : - + if test -n "$gl_replace_getopt"; then REPLACE_GETOPT=1 - -fi - + fi if test $REPLACE_GETOPT = 1; then @@ -12918,7 +13286,7 @@ $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h fi -if test $REPLACE_GETOPT = 1; then + if test $REPLACE_GETOPT = 1; then @@ -12942,8 +13310,8 @@ if test $REPLACE_GETOPT = 1; then - GNULIB_GL_UNISTD_H_GETOPT=1 -fi + GNULIB_GL_UNISTD_H_GETOPT=1 + fi @@ -13017,12 +13385,8 @@ $as_echo "$gl_cv_func_gettimeofday_clobber" >&6; } *yes) REPLACE_GETTIMEOFDAY=1 - -$as_echo "#define gmtime rpl_gmtime" >>confdefs.h - - -$as_echo "#define localtime rpl_localtime" >>confdefs.h - + REPLACE_GMTIME=1 + REPLACE_LOCALTIME=1 $as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h @@ -13101,7 +13465,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then + if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then @@ -13137,7 +13501,7 @@ fi done -fi + fi @@ -13188,36 +13552,40 @@ else if test $ac_cv_header_iconv_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'iconv.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'iconv.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_iconv_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_iconv_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_iconv_h + gl_cv_next_iconv_h='"'$gl_header'"' else gl_cv_next_iconv_h='<'iconv.h'>' fi @@ -13311,7 +13679,7 @@ fi fi -if test $REPLACE_ICONV_OPEN = 1; then + if test $REPLACE_ICONV_OPEN = 1; then @@ -13322,8 +13690,8 @@ if test $REPLACE_ICONV_OPEN = 1; then gl_LIBOBJS="$gl_LIBOBJS iconv_open.$ac_objext" -fi -if test $REPLACE_ICONV = 1; then + fi + if test $REPLACE_ICONV = 1; then @@ -13344,7 +13712,7 @@ if test $REPLACE_ICONV = 1; then gl_LIBOBJS="$gl_LIBOBJS iconv_close.$ac_objext" -fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler generally respects inline" >&5 @@ -13393,7 +13761,7 @@ $as_echo "#define HAVE_INLINE 1" >>confdefs.h -LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" + LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" @@ -13530,36 +13898,40 @@ if ${gl_cv_next_locale_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'locale.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'locale.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_locale_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_locale_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_locale_h + gl_cv_next_locale_h='"'$gl_header'"' fi @@ -14154,6 +14526,49 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_nul_retval" >&5 $as_echo "$gl_cv_func_mbrtowc_nul_retval" >&6; } + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works on empty input" >&5 +$as_echo_n "checking whether mbrtowc works on empty input... " >&6; } +if ${gl_cv_func_mbrtowc_empty_input+:} false; then : + $as_echo_n "(cached) " >&6 +else + + case "$host_os" in + # Guess no on AIX and glibc systems. + aix* | *-gnu*) + gl_cv_func_mbrtowc_empty_input="guessing no" ;; + *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; + esac + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + static wchar_t wc; + static mbstate_t mbs; + int + main (void) + { + return mbrtowc (&wc, "", 0, &mbs) == (size_t) -2; + } +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_mbrtowc_empty_input=no +else + gl_cv_func_mbrtowc_empty_input=yes +fi +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_mbrtowc_empty_input" >&5 +$as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; } + case "$gl_cv_func_mbrtowc_null_arg1" in *yes) ;; *) @@ -14183,13 +14598,21 @@ $as_echo "#define MBRTOWC_RETVAL_BUG 1" >>confdefs.h *) $as_echo "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h + REPLACE_MBRTOWC=1 + ;; + esac + case "$gl_cv_func_mbrtowc_empty_input" in + *yes) ;; + *) +$as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h + REPLACE_MBRTOWC=1 ;; esac fi fi -if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then @@ -14203,7 +14626,7 @@ if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then : -fi + fi @@ -14412,7 +14835,7 @@ _ACEOF fi fi -if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then + if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then @@ -14426,7 +14849,7 @@ if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then : -fi + fi @@ -14748,7 +15171,7 @@ $as_echo "$gl_cv_func_mbsrtowcs_works" >&6; } fi fi -if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then + if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then @@ -14772,7 +15195,7 @@ if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then : -fi + fi @@ -14795,7 +15218,7 @@ $as_echo "#define GNULIB_TEST_MBSRTOWCS 1" >>confdefs.h REPLACE_MBTOWC=1 fi -if test $REPLACE_MBTOWC = 1; then + if test $REPLACE_MBTOWC = 1; then @@ -14809,7 +15232,7 @@ if test $REPLACE_MBTOWC = 1; then : -fi + fi @@ -14826,7 +15249,7 @@ $as_echo "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h -if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then + if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then @@ -14851,7 +15274,7 @@ fi done -fi + fi @@ -14994,36 +15417,40 @@ if ${gl_cv_next_stddef_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'stddef.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'stddef.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_stddef_h + gl_cv_next_stddef_h='"'$gl_header'"' fi @@ -15057,7 +15484,6 @@ $as_echo "$gl_cv_next_stddef_h" >&6; } - if test $gl_cv_have_include_next = yes; then gl_cv_next_stdio_h='<'stdio.h'>' else @@ -15067,36 +15493,40 @@ if ${gl_cv_next_stdio_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'stdio.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'stdio.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_stdio_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_stdio_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_stdio_h + gl_cv_next_stdio_h='"'$gl_header'"' fi @@ -15119,7 +15549,21 @@ $as_echo "$gl_cv_next_stdio_h" >&6; } GNULIB_FSCANF=1 + + +cat >>confdefs.h <<_ACEOF +#define GNULIB_FSCANF 1 +_ACEOF + + GNULIB_SCANF=1 + + +cat >>confdefs.h <<_ACEOF +#define GNULIB_SCANF 1 +_ACEOF + + GNULIB_FGETC=1 GNULIB_GETC=1 GNULIB_GETCHAR=1 @@ -15200,36 +15644,40 @@ if ${gl_cv_next_stdlib_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'stdlib.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'stdlib.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_stdlib_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_stdlib_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_stdlib_h + gl_cv_next_stdlib_h='"'$gl_header'"' fi @@ -15252,7 +15700,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 random random_r realpath rpmatch 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 random random_r 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; } @@ -15298,10 +15746,10 @@ fi done -if test $gl_cond_libtool = false; then - gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV" - gl_libdeps="$gl_libdeps $LIBICONV" -fi + if test $gl_cond_libtool = false; then + gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV" + gl_libdeps="$gl_libdeps $LIBICONV" + fi @@ -15403,7 +15851,7 @@ $as_echo "$gl_cv_func_strstr_linear" >&6; } esac fi -if test $REPLACE_STRSTR = 1; then + if test $REPLACE_STRSTR = 1; then @@ -15414,7 +15862,7 @@ if test $REPLACE_STRSTR = 1; then gl_LIBOBJS="$gl_LIBOBJS strstr.$ac_objext" -fi + fi @@ -15494,7 +15942,7 @@ $as_echo "$gl_cv_func_strstr_works_always" >&6; } esac fi -if test $REPLACE_STRSTR = 1; then + if test $REPLACE_STRSTR = 1; then @@ -15505,7 +15953,7 @@ if test $REPLACE_STRSTR = 1; then gl_LIBOBJS="$gl_LIBOBJS strstr.$ac_objext" -fi + fi @@ -15535,8 +15983,6 @@ $as_echo "#define GNULIB_TEST_STRSTR 1" >>confdefs.h - - if test $gl_cv_have_include_next = yes; then gl_cv_next_sys_stat_h='<'sys/stat.h'>' else @@ -15549,36 +15995,40 @@ else if test $ac_cv_header_sys_stat_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'sys/stat.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'sys/stat.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_sys_stat_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_sys_stat_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_sys_stat_h + gl_cv_next_sys_stat_h='"'$gl_header'"' else gl_cv_next_sys_stat_h='<'sys/stat.h'>' fi @@ -15682,82 +16132,6 @@ fi - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_sys_types_h='<'sys/types.h'>' - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -$as_echo_n "checking absolute name of ... " >&6; } -if ${gl_cv_next_sys_types_h+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'sys/types.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_sys_types_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5 -$as_echo "$gl_cv_next_sys_types_h" >&6; } - fi - NEXT_SYS_TYPES_H=$gl_cv_next_sys_types_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'sys/types.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_sys_types_h - fi - NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H=$gl_next_as_first_directive - - - - - - - - - - - - - - - - - - - - @@ -15778,36 +16152,40 @@ else if test $ac_cv_header_unistd_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'unistd.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'unistd.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_unistd_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_unistd_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_unistd_h + gl_cv_next_unistd_h='"'$gl_header'"' else gl_cv_next_unistd_h='<'unistd.h'>' fi @@ -16045,36 +16423,40 @@ else if test $ac_cv_header_wchar_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'wchar.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'wchar.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_wchar_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_wchar_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_wchar_h + gl_cv_next_wchar_h='"'$gl_header'"' else gl_cv_next_wchar_h='<'wchar.h'>' fi @@ -16433,7 +16815,7 @@ $as_echo "$gl_cv_func_wcrtomb_retval" >&6; } fi fi -if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then + if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then @@ -16447,7 +16829,7 @@ if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then : -fi + fi @@ -16470,7 +16852,7 @@ $as_echo "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h HAVE_WCSDUP=0 fi -if test $HAVE_WCSDUP = 0; then + if test $HAVE_WCSDUP = 0; then @@ -16481,7 +16863,7 @@ if test $HAVE_WCSDUP = 0; then gl_LIBOBJS="$gl_LIBOBJS wcsdup.$ac_objext" -fi + fi @@ -16642,7 +17024,7 @@ _ACEOF fi fi -if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then + if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then @@ -16656,7 +17038,7 @@ if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then : -fi + fi @@ -16679,7 +17061,7 @@ $as_echo "#define GNULIB_TEST_WCTOB 1" >>confdefs.h REPLACE_WCTOMB=1 fi -if test $REPLACE_WCTOMB = 1; then + if test $REPLACE_WCTOMB = 1; then @@ -16693,7 +17075,7 @@ if test $REPLACE_WCTOMB = 1; then : -fi + fi @@ -16722,8 +17104,6 @@ $as_echo "#define GNULIB_TEST_WCTOMB 1" >>confdefs.h - - if test $gt_cv_c_wint_t = yes; then HAVE_WINT_T=1 else @@ -16752,36 +17132,40 @@ else if test $ac_cv_header_wctype_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'wctype.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'wctype.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_wctype_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_wctype_h + gl_cv_next_wctype_h='"'$gl_header'"' else gl_cv_next_wctype_h='<'wctype.h'>' fi @@ -17110,7 +17494,7 @@ $as_echo "$gl_cv_func_wmemcpy" >&6; } HAVE_WMEMCPY=0 fi -if test $HAVE_WMEMCPY = 0; then + if test $HAVE_WMEMCPY = 0; then @@ -17121,7 +17505,7 @@ if test $HAVE_WMEMCPY = 0; then gl_LIBOBJS="$gl_LIBOBJS wmemcpy.$ac_objext" -fi + fi @@ -18067,6 +18451,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -18553,7 +18945,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.4, which was +This file was extended by Star Traders $as_me 7.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18620,7 +19012,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.4 +Star Traders config.status 7.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -19361,7 +19753,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -19374,7 +19766,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -19408,21 +19800,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -19465,7 +19855,7 @@ $as_echo X"$file" | case "$ac_file" in */Makefile.in) # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. diff --git a/doc/Makefile.in b/doc/Makefile.in index 966af5b..33c9245 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,12 +17,12 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2012, John Zaitseff # +# Copyright (C) 1990-2014, John Zaitseff # # # ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 362 2012-03-14 15:36:23Z john $ +# $Id: Makefile.am 514 2014-05-22 01:05:51Z john $ # # This file, doc/Makefile.am, contains the documentation directory # Makefile for Star Traders. It needs to be processed by automake to @@ -43,23 +42,51 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -78,19 +105,22 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = README $(dist_man6_MANS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(dist_man6_MANS) README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/assert.m4 $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/assert.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ $(top_srcdir)/m4/ax_c___attribute__.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/ax_with_curses.m4 $(top_srcdir)/m4/btowc.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \ @@ -125,6 +155,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -163,10 +205,12 @@ man6dir = $(mandir)/man6 am__installdirs = "$(DESTDIR)$(man6dir)" NROFF = nroff MANS = $(dist_man6_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ @@ -342,6 +386,7 @@ GNULIB_RENAMEAT = @GNULIB_RENAMEAT@ GNULIB_RMDIR = @GNULIB_RMDIR@ GNULIB_RPMATCH = @GNULIB_RPMATCH@ GNULIB_SCANF = @GNULIB_SCANF@ +GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ @@ -547,6 +592,7 @@ HAVE_READLINKAT = @HAVE_READLINKAT@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ +HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -731,11 +777,13 @@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ +REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ICONV = @REPLACE_ICONV@ REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@ REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@ @@ -746,6 +794,7 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ +REPLACE_LOCALTIME = @REPLACE_LOCALTIME@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ @@ -771,6 +820,7 @@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ +REPLACE_PTSNAME = @REPLACE_PTSNAME@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ @@ -830,6 +880,7 @@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -900,6 +951,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -984,27 +1036,14 @@ uninstall-man6: } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^6][0-9a-z]*$$,6,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man6dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1141,16 +1180,17 @@ uninstall-man: uninstall-man6 .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man6 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-am uninstall-man uninstall-man6 +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man6 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags-am uninstall uninstall-am uninstall-man \ + uninstall-man6 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib/Makefile.am b/lib/Makefile.am index c413a0a..dddf7a5 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,6 @@ ## DO NOT EDIT! GENERATED AUTOMATICALLY! ## Process this file with automake to produce Makefile.in. -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 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 @@ -21,9 +21,9 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h getopt-gnu gettext gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h -AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects +AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects SUBDIRS = noinst_HEADERS = @@ -48,6 +48,15 @@ libgnu_a_LIBADD = $(gl_LIBOBJS) libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) EXTRA_libgnu_a_SOURCES = +## begin gnulib module absolute-header + +# Use this preprocessor expression to decide whether #include_next works. +# Do not rely on a 'configure'-time test for this, since the expression +# might appear in an installed header, which is used by some other compiler. +HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER) + +## end gnulib module absolute-header + ## begin gnulib module btowc @@ -72,7 +81,7 @@ libgnu_a_SOURCES += c-strcase.h c-strcasecmp.c c-strncasecmp.c ## begin gnulib module configmake # Listed in the same order as the GNU makefile conventions, and -# provided by autoconf 2.59c+. +# provided by autoconf 2.59c+ or 2.70. # The Automake-defined pkg* macros are appended, in the order # listed in the Automake 1.10a+ documentation. configmake.h: Makefile @@ -88,6 +97,7 @@ configmake.h: Makefile echo '#define SYSCONFDIR "$(sysconfdir)"'; \ echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \ echo '#define LOCALSTATEDIR "$(localstatedir)"'; \ + echo '#define RUNSTATEDIR "$(runstatedir)"'; \ echo '#define INCLUDEDIR "$(includedir)"'; \ echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \ echo '#define DOCDIR "$(docdir)"'; \ @@ -113,6 +123,14 @@ CLEANFILES += configmake.h configmake.h-t ## end gnulib module configmake +## begin gnulib module crc + +libgnu_a_SOURCES += crc.c + +EXTRA_DIST += crc.h + +## end gnulib module crc + ## begin gnulib module getopt-posix BUILT_SOURCES += $(GETOPT_H) @@ -142,15 +160,16 @@ EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c ## begin gnulib module gettext -# This is for those projects which use "gettextize --intl" to put a source-code -# copy of libintl into their package. In such projects, every Makefile.am needs +# If your project uses "gettextize --intl" to put a source-code +# copy of libintl into the package, every Makefile.am needs # -I$(top_builddir)/intl, so that can be found in this directory. -# For the Makefile.ams in other directories it is the maintainer's -# responsibility; for the one from gnulib we do it here. -# This option has no effect when the user disables NLS (because then the intl -# directory contains no libintl.h file) or when the project does not use -# "gettextize --intl". -AM_CPPFLAGS += -I$(top_builddir)/intl +# Here's one way to do this: +#AM_CPPFLAGS += -I$(top_builddir)/intl +# This option has no effect when the user disables NLS (because then +# the intl directory contains no libintl.h file). This option is not +# enabled by default because the intl directory might not exist if +# your project does not use "gettext --intl", and some compilers +# complain about -I options applied to nonexistent directories. EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath @@ -777,6 +796,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ + -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ @@ -805,6 +825,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|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_STRTOD''@|$(HAVE_STRTOD)|g' \ -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ @@ -818,6 +839,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ + -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ @@ -1104,6 +1126,7 @@ time.h: time.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_TIME_H''@|$(NEXT_TIME_H)|g' \ + -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ @@ -1113,6 +1136,8 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ + -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ + -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ @@ -1135,6 +1160,7 @@ EXTRA_DIST += time.in.h ## begin gnulib module unistd BUILT_SOURCES += unistd.h +libgnu_a_SOURCES += unistd.c # We need the following in order to create an empty placeholder for # when the system doesn't have one. @@ -1249,6 +1275,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ + -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \ -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ @@ -1497,6 +1524,7 @@ EXTRA_libgnu_a_SOURCES += wctomb.c ## begin gnulib module wctype-h BUILT_SOURCES += wctype.h +libgnu_a_SOURCES += wctype-h.c # We need the following in order to create when the system # doesn't have one that works with the given compiler. diff --git a/lib/Makefile.in b/lib/Makefile.in index cb80cac..b025482 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,7 +14,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 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 @@ -36,28 +35,56 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h getopt-gnu gettext gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -78,19 +105,22 @@ host_triplet = @host@ @LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__append_1 = unistr/u8-mbtoucr.c @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_2 = unistr/u8-uctomb.c unistr/u8-uctomb-aux.c subdir = lib -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp $(noinst_HEADERS) README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/assert.m4 $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/assert.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ $(top_srcdir)/m4/ax_c___attribute__.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/ax_with_curses.m4 $(top_srcdir)/m4/btowc.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \ @@ -126,39 +156,65 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libgnu_a_AR = $(AR) $(ARFLAGS) am__DEPENDENCIES_1 = am__libgnu_a_SOURCES_DIST = c-ctype.h c-ctype.c c-strcase.h \ - c-strcasecmp.c c-strncasecmp.c gettext.h localcharset.h \ + c-strcasecmp.c c-strncasecmp.c crc.c gettext.h localcharset.h \ localcharset.c striconv.h striconv.c strnlen1.h strnlen1.c \ - unistr/u8-mbtoucr.c unistr/u8-uctomb.c unistr/u8-uctomb-aux.c + unistd.c unistr/u8-mbtoucr.c unistr/u8-uctomb.c \ + unistr/u8-uctomb-aux.c wctype-h.c am__dirstamp = $(am__leading_dot)dirstamp @LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__objects_1 = unistr/u8-mbtoucr.$(OBJEXT) @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_2 = unistr/u8-uctomb.$(OBJEXT) \ @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@ unistr/u8-uctomb-aux.$(OBJEXT) am_libgnu_a_OBJECTS = c-ctype.$(OBJEXT) c-strcasecmp.$(OBJEXT) \ - c-strncasecmp.$(OBJEXT) localcharset.$(OBJEXT) \ - striconv.$(OBJEXT) strnlen1.$(OBJEXT) $(am__objects_1) \ - $(am__objects_2) + c-strncasecmp.$(OBJEXT) crc.$(OBJEXT) localcharset.$(OBJEXT) \ + striconv.$(OBJEXT) strnlen1.$(OBJEXT) unistd.$(OBJEXT) \ + $(am__objects_1) $(am__objects_2) wctype-h.$(OBJEXT) libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) LTLIBRARIES = $(noinst_LTLIBRARIES) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) DIST_SOURCES = $(am__libgnu_a_SOURCES_DIST) $(EXTRA_libgnu_a_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -167,9 +223,29 @@ am__can_run_installinfo = \ HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -202,6 +278,7 @@ am__relativize = \ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ @@ -377,6 +454,7 @@ GNULIB_RENAMEAT = @GNULIB_RENAMEAT@ GNULIB_RMDIR = @GNULIB_RMDIR@ GNULIB_RPMATCH = @GNULIB_RPMATCH@ GNULIB_SCANF = @GNULIB_SCANF@ +GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ @@ -582,6 +660,7 @@ HAVE_READLINKAT = @HAVE_READLINKAT@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ +HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -766,11 +845,13 @@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ +REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ICONV = @REPLACE_ICONV@ REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@ REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@ @@ -781,6 +862,7 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ +REPLACE_LOCALTIME = @REPLACE_LOCALTIME@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ @@ -806,6 +888,7 @@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ +REPLACE_PTSNAME = @REPLACE_PTSNAME@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ @@ -865,6 +948,7 @@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -935,6 +1019,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -943,12 +1028,23 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects +AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects SUBDIRS = noinst_HEADERS = noinst_LIBRARIES = libgnu.a noinst_LTLIBRARIES = -EXTRA_DIST = btowc.c getopt.c getopt.in.h getopt1.c getopt_int.h \ + +# If your project uses "gettextize --intl" to put a source-code +# copy of libintl into the package, every Makefile.am needs +# -I$(top_builddir)/intl, so that can be found in this directory. +# Here's one way to do this: +#AM_CPPFLAGS += -I$(top_builddir)/intl +# This option has no effect when the user disables NLS (because then +# the intl directory contains no libintl.h file). This option is not +# enabled by default because the intl directory might not exist if +# your project does not use "gettext --intl", and some compilers +# complain about -I options applied to nonexistent directories. +EXTRA_DIST = btowc.c crc.h getopt.c getopt.in.h getopt1.c getopt_int.h \ $(top_srcdir)/build-aux/config.rpath gettimeofday.c \ $(top_srcdir)/build-aux/config.rpath iconv.in.h \ iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h \ @@ -1009,27 +1105,23 @@ CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \ DISTCLEANFILES = MAINTAINERCLEANFILES = iconv_open-aix.h iconv_open-hpux.h \ iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h - -# This is for those projects which use "gettextize --intl" to put a source-code -# copy of libintl into their package. In such projects, every Makefile.am needs -# -I$(top_builddir)/intl, so that can be found in this directory. -# For the Makefile.ams in other directories it is the maintainer's -# responsibility; for the one from gnulib we do it here. -# This option has no effect when the user disables NLS (because then the intl -# directory contains no libintl.h file) or when the project does not use -# "gettextize --intl". -AM_CPPFLAGS = -I$(top_builddir)/intl +AM_CPPFLAGS = AM_CFLAGS = libgnu_a_SOURCES = c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c \ - c-strncasecmp.c gettext.h localcharset.h localcharset.c \ - striconv.h striconv.c strnlen1.h strnlen1.c $(am__append_1) \ - $(am__append_2) + c-strncasecmp.c crc.c gettext.h localcharset.h localcharset.c \ + striconv.h striconv.c strnlen1.h strnlen1.c unistd.c \ + $(am__append_1) $(am__append_2) wctype-h.c libgnu_a_LIBADD = $(gl_LIBOBJS) libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) EXTRA_libgnu_a_SOURCES = btowc.c getopt.c getopt1.c gettimeofday.c \ iconv.c iconv_close.c iconv_open.c mbrtowc.c mbsinit.c \ mbsrtowcs-state.c mbsrtowcs.c mbtowc.c memchr.c strstr.c \ wcrtomb.c wcsdup.c wctob.c wctomb.c wmemcpy.c + +# Use this preprocessor expression to decide whether #include_next works. +# Do not rely on a 'configure'-time test for this, since the expression +# might appear in an installed header, which is used by some other compiler. +HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER) GPERF = gperf charset_alias = $(DESTDIR)$(libdir)/charset.alias charset_tmp = $(DESTDIR)$(libdir)/charset.tmp @@ -1092,25 +1184,26 @@ unistr/u8-uctomb.$(OBJEXT): unistr/$(am__dirstamp) \ unistr/$(DEPDIR)/$(am__dirstamp) unistr/u8-uctomb-aux.$(OBJEXT): unistr/$(am__dirstamp) \ unistr/$(DEPDIR)/$(am__dirstamp) + libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) $(EXTRA_libgnu_a_DEPENDENCIES) - -rm -f libgnu.a - $(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) - $(RANLIB) libgnu.a + $(AM_V_at)-rm -f libgnu.a + $(AM_V_AR)$(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) + $(AM_V_at)$(RANLIB) libgnu.a clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f unistr/u8-mbtoucr.$(OBJEXT) - -rm -f unistr/u8-uctomb-aux.$(OBJEXT) - -rm -f unistr/u8-uctomb.$(OBJEXT) + -rm -f unistr/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -1119,6 +1212,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-ctype.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strcasecmp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strncasecmp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettimeofday.Po@am__quote@ @@ -1135,48 +1229,53 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/striconv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strstr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unistd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcrtomb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcsdup.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctob.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctomb.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctype-h.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wmemcpy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-mbtoucr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-uctomb-aux.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/u8-uctomb.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -1191,57 +1290,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -1257,12 +1311,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1274,15 +1323,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1291,6 +1336,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1465,28 +1525,27 @@ ps-am: uninstall-am: uninstall-local -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - ctags-recursive install install-am install-strip \ - tags-recursive +.MAKE: $(am__recursive_targets) all check install install-am \ + install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am all-local check check-am clean clean-generic \ - clean-noinstLIBRARIES clean-noinstLTLIBRARIES ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-exec-local \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-local pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am uninstall-local +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \ + check check-am clean clean-generic clean-noinstLIBRARIES \ + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-local install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-local # Listed in the same order as the GNU makefile conventions, and -# provided by autoconf 2.59c+. +# provided by autoconf 2.59c+ or 2.70. # The Automake-defined pkg* macros are appended, in the order # listed in the Automake 1.10a+ documentation. configmake.h: Makefile @@ -1502,6 +1561,7 @@ configmake.h: Makefile echo '#define SYSCONFDIR "$(sysconfdir)"'; \ echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \ echo '#define LOCALSTATEDIR "$(localstatedir)"'; \ + echo '#define RUNSTATEDIR "$(runstatedir)"'; \ echo '#define INCLUDEDIR "$(includedir)"'; \ echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \ echo '#define DOCDIR "$(docdir)"'; \ @@ -1918,6 +1978,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ + -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ @@ -1946,6 +2007,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|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_STRTOD''@|$(HAVE_STRTOD)|g' \ -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ @@ -1959,6 +2021,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ + -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ @@ -2169,6 +2232,7 @@ time.h: time.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_TIME_H''@|$(NEXT_TIME_H)|g' \ + -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ @@ -2178,6 +2242,8 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ + -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ + -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ @@ -2305,6 +2371,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ + -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \ -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ diff --git a/lib/btowc.c b/lib/btowc.c index cec9eca..b06ca2e 100644 --- a/lib/btowc.c +++ b/lib/btowc.c @@ -1,5 +1,5 @@ /* Convert unibyte character to wide character. - Copyright (C) 2008, 2010-2012 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/c-ctype.c b/lib/c-ctype.c index 952d7a8..48c6478 100644 --- a/lib/c-ctype.c +++ b/lib/c-ctype.c @@ -1,6 +1,6 @@ /* Character handling in C locale. - Copyright 2000-2003, 2006, 2009-2012 Free Software Foundation, Inc. + Copyright 2000-2003, 2006, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/c-ctype.h b/lib/c-ctype.h index 0b31309..b465277 100644 --- a/lib/c-ctype.h +++ b/lib/c-ctype.h @@ -5,7 +5,7 @@ functions' behaviour depends on the current locale set via setlocale. - Copyright (C) 2000-2003, 2006, 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 2008-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -136,7 +136,8 @@ extern int c_tolower (int c) _GL_ATTRIBUTE_CONST; extern int c_toupper (int c) _GL_ATTRIBUTE_CONST; -#if defined __GNUC__ && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ && !defined NO_C_CTYPE_MACROS +#if (defined __GNUC__ && !defined __STRICT_ANSI__ && defined __OPTIMIZE__ \ + && !defined __OPTIMIZE_SIZE__ && !defined NO_C_CTYPE_MACROS) /* ASCII optimizations. */ diff --git a/lib/c-strcase.h b/lib/c-strcase.h index fdef238..8e66044 100644 --- a/lib/c-strcase.h +++ b/lib/c-strcase.h @@ -1,5 +1,5 @@ /* Case-insensitive string comparison functions in C locale. - Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2012 Free Software + Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c index d8332ca..b9b26a4 100644 --- a/lib/c-strcasecmp.c +++ b/lib/c-strcasecmp.c @@ -1,5 +1,5 @@ /* c-strcasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c index 47fb5fd..972eb80 100644 --- a/lib/c-strncasecmp.c +++ b/lib/c-strncasecmp.c @@ -1,5 +1,5 @@ /* c-strncasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/config.charset b/lib/config.charset index 89b3017..289bc44 100644 --- a/lib/config.charset +++ b/lib/config.charset @@ -1,7 +1,7 @@ #! /bin/sh # Output a system dependent table of character encoding aliases. # -# Copyright (C) 2000-2004, 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2000-2004, 2006-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ # The current list of GNU canonical charset names is as follows. # # name MIME? used by which systems -# (darwin = MacOS X, woe32 = native Windows) +# (darwin = Mac OS X, woe32 = native Windows) # # ASCII, ANSI_X3.4-1968 glibc solaris freebsd netbsd darwin cygwin # ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin diff --git a/lib/crc.c b/lib/crc.c new file mode 100644 index 0000000..5970ef9 --- /dev/null +++ b/lib/crc.c @@ -0,0 +1,103 @@ +/* crc.c -- cyclic redundancy checks + Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. + + This program 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, or (at your option) + any later version. + + This program 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 program. If not, see . */ + +/* Written by Simon Josefsson. */ + +#include + +#include "crc.h" + +/* Table of CRCs of all 8-bit messages. Generated by running code + from RFC 1952 modified to print out the table. */ +static const uint32_t crc32_table[256] = { + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, + 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, + 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, + 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, + 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, + 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, + 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, + 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, + 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, + 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, + 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, + 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, + 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, + 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, + 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, + 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, + 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, + 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, + 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, + 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, + 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, + 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, + 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, + 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, + 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, + 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, + 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, + 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, + 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, + 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, + 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, + 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, + 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, + 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, + 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, + 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, + 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, + 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, + 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, + 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d +}; + +/* + * The following function was extracted from RFC 1952 by Simon + * Josefsson. It was modified to avoid initial and final XOR, to use + * size_t for the buffer length, and to use the const keyword. + */ +uint32_t +crc32_update_no_xor (uint32_t crc, const char *buf, size_t len) +{ + size_t n; + + for (n = 0; n < len; n++) + crc = crc32_table[(crc ^ buf[n]) & 0xff] ^ (crc >> 8); + + return crc; +} + +uint32_t +crc32_no_xor (const char *buf, size_t len) +{ + return crc32_update_no_xor (0L, buf, len); +} + +uint32_t +crc32_update (uint32_t crc, const char *buf, size_t len) +{ + return crc32_update_no_xor (crc ^ 0xffffffff, buf, len) ^ 0xffffffff; +} + +uint32_t +crc32 (const char *buf, size_t len) +{ + return crc32_update (0L, buf, len); +} diff --git a/lib/crc.h b/lib/crc.h new file mode 100644 index 0000000..9095864 --- /dev/null +++ b/lib/crc.h @@ -0,0 +1,47 @@ +/* crc.h -- cyclic redundancy checks + Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. + + This program 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 program 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 program. If not, see . */ + +/* Written by Simon Josefsson. */ + +#ifndef CRC_H +# define CRC_H 1 + +#include +#include + +/* Compute CRC-32 value of LEN bytes long BUF, and return it. */ +extern uint32_t crc32 (const char *buf, size_t len); + +/* Incrementally update CRC-32 value CRC using LEN bytes long BUF. In + the first call, use 0 as the value for CRC. Return the updated + CRC-32 value. */ +extern uint32_t crc32_update (uint32_t crc, const char *buf, size_t len); + +/* Compute modified-CRC-32 value of LEN bytes long BUF, and return it. + The "modification" is to avoid the initial and final XOR operation. + Due to historic implementation errors, this variant is sometimes + used (i.e., in RFC 3961). */ +extern uint32_t crc32_no_xor (const char *buf, size_t len); + +/* Incrementally update modified-CRC-32 value CRC using LEN bytes long + BUF. In the first call, use 0 as the value for CRC. Return the + updated modified-CRC-32 value. The "modification" is to avoid the + initial and final XOR operation. Due to historic implementation + errors, this variant is sometimes used (i.e., in RFC 3961). */ +extern uint32_t +crc32_update_no_xor (uint32_t crc, const char *buf, size_t len); + +#endif /* CRC_H */ diff --git a/lib/getopt.c b/lib/getopt.c index 4342a34..7d950af 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -2,7 +2,7 @@ NOTE: getopt is part of the C library, so if you don't know what "Keep this file name-space clean" means, talk to drepper@gnu.org before changing it! - Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2012 Free Software + Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/getopt.in.h b/lib/getopt.in.h index 06b6dfc..7ab99fb 100644 --- a/lib/getopt.in.h +++ b/lib/getopt.in.h @@ -1,5 +1,5 @@ /* Declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2012 Free Software + Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -49,7 +49,9 @@ linkers. */ #if defined __GETOPT_PREFIX && !defined __need_getopt # if !@HAVE_GETOPT_H@ +# define __need_system_stdlib_h # include +# undef __need_system_stdlib_h # include # include # endif diff --git a/lib/getopt1.c b/lib/getopt1.c index fb2a8f5..a184865 100644 --- a/lib/getopt1.c +++ b/lib/getopt1.c @@ -1,5 +1,5 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2012 Free Software + Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/getopt_int.h b/lib/getopt_int.h index 2da020c..24ed672 100644 --- a/lib/getopt_int.h +++ b/lib/getopt_int.h @@ -1,5 +1,5 @@ /* Internal declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2012 Free Software + Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/gettext.h b/lib/gettext.h index 75875cd..c7d6fd3 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -1,5 +1,5 @@ /* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2012 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -183,9 +183,12 @@ npgettext_aux (const char *domain, #include -#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \ - (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ - /* || __STDC_VERSION__ >= 199901L */ ) +#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ + /* || __STDC_VERSION__ >= 199901L */ ) +# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1 +#else +# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0 +#endif #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS #include diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c index 5d35060..8b2058e 100644 --- a/lib/gettimeofday.c +++ b/lib/gettimeofday.c @@ -1,6 +1,6 @@ /* Provide gettimeofday for systems that don't have it or for which it's broken. - Copyright (C) 2001-2003, 2005-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/iconv.c b/lib/iconv.c index 66966dd..b5a427b 100644 --- a/lib/iconv.c +++ b/lib/iconv.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 1999-2001, 2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/iconv.in.h b/lib/iconv.in.h index 1ee4239..d0e9836 100644 --- a/lib/iconv.in.h +++ b/lib/iconv.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/iconv_close.c b/lib/iconv_close.c index c02f76c..d66c115 100644 --- a/lib/iconv_close.c +++ b/lib/iconv_close.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/iconv_open-aix.h b/lib/iconv_open-aix.h deleted file mode 100644 index 0ffc3fe..0000000 --- a/lib/iconv_open-aix.h +++ /dev/null @@ -1,256 +0,0 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ -/* Command-line: gperf -m 10 ./iconv_open-aix.gperf */ -/* Computed positions: -k'4,$' */ - -#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ - && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ - && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ - && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ - && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ - && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ - && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ - && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ - && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ - && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ - && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ - && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ - && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ - && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ - && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ - && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ - && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ - && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ - && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ - && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ - && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ - && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ - && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) -/* The character set is not based on ISO-646. */ -#error "gperf generated tables don't work with this execution character set. Please report a bug to ." -#endif - -#line 1 "./iconv_open-aix.gperf" -struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - -#define TOTAL_KEYWORDS 32 -#define MIN_WORD_LENGTH 4 -#define MAX_WORD_LENGTH 11 -#define MIN_HASH_VALUE 6 -#define MAX_HASH_VALUE 44 -/* maximum key range = 39, duplicates = 0 */ - -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static unsigned int -mapping_hash (register const char *str, register unsigned int len) -{ - static const unsigned char asso_values[] = - { - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 0, 4, 25, - 0, 11, 24, 9, 17, 3, 14, 21, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 3, 45, 1, 45, 45, 45, 45, 0, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45 - }; - return len + asso_values[(unsigned char)str[3]+2] + asso_values[(unsigned char)str[len - 1]]; -} - -struct stringpool_t - { - char stringpool_str6[sizeof("EUC-TW")]; - char stringpool_str7[sizeof("EUC-KR")]; - char stringpool_str8[sizeof("CP852")]; - char stringpool_str9[sizeof("EUC-JP")]; - char stringpool_str10[sizeof("ISO-8859-2")]; - char stringpool_str11[sizeof("CP857")]; - char stringpool_str12[sizeof("CP850")]; - char stringpool_str13[sizeof("ISO-8859-7")]; - char stringpool_str14[sizeof("CP932")]; - char stringpool_str15[sizeof("GB2312")]; - char stringpool_str16[sizeof("BIG5")]; - char stringpool_str17[sizeof("CP437")]; - char stringpool_str19[sizeof("ISO-8859-5")]; - char stringpool_str20[sizeof("ISO-8859-15")]; - char stringpool_str21[sizeof("ISO-8859-3")]; - char stringpool_str22[sizeof("ISO-8859-13")]; - char stringpool_str23[sizeof("CP1046")]; - char stringpool_str24[sizeof("ISO-8859-8")]; - char stringpool_str25[sizeof("CP856")]; - char stringpool_str26[sizeof("CP1125")]; - char stringpool_str27[sizeof("ISO-8859-6")]; - char stringpool_str28[sizeof("CP865")]; - char stringpool_str29[sizeof("CP922")]; - char stringpool_str30[sizeof("CP1252")]; - char stringpool_str31[sizeof("ISO-8859-9")]; - char stringpool_str33[sizeof("CP943")]; - char stringpool_str34[sizeof("ISO-8859-4")]; - char stringpool_str35[sizeof("ISO-8859-1")]; - char stringpool_str38[sizeof("CP1129")]; - char stringpool_str40[sizeof("CP869")]; - char stringpool_str41[sizeof("CP1124")]; - char stringpool_str44[sizeof("CP861")]; - }; -static const struct stringpool_t stringpool_contents = - { - "EUC-TW", - "EUC-KR", - "CP852", - "EUC-JP", - "ISO-8859-2", - "CP857", - "CP850", - "ISO-8859-7", - "CP932", - "GB2312", - "BIG5", - "CP437", - "ISO-8859-5", - "ISO-8859-15", - "ISO-8859-3", - "ISO-8859-13", - "CP1046", - "ISO-8859-8", - "CP856", - "CP1125", - "ISO-8859-6", - "CP865", - "CP922", - "CP1252", - "ISO-8859-9", - "CP943", - "ISO-8859-4", - "ISO-8859-1", - "CP1129", - "CP869", - "CP1124", - "CP861" - }; -#define stringpool ((const char *) &stringpool_contents) - -static const struct mapping mappings[] = - { - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, -#line 43 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "IBM-eucTW"}, -#line 42 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, "IBM-eucKR"}, -#line 25 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, "IBM-852"}, -#line 41 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, "IBM-eucJP"}, -#line 14 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "ISO8859-2"}, -#line 27 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "IBM-857"}, -#line 24 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "IBM-850"}, -#line 19 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "ISO8859-7"}, -#line 33 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "IBM-932"}, -#line 40 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "IBM-eucCN"}, -#line 44 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "big5"}, -#line 23 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "IBM-437"}, - {-1}, -#line 17 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "ISO8859-5"}, -#line 22 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, "ISO8859-15"}, -#line 15 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, "ISO8859-3"}, -#line 31 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, "IBM-921"}, -#line 35 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, "IBM-1046"}, -#line 20 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, "ISO8859-8"}, -#line 26 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, "IBM-856"}, -#line 37 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, "IBM-1125"}, -#line 18 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, "ISO8859-6"}, -#line 29 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, "IBM-865"}, -#line 32 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, "IBM-922"}, -#line 39 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, "IBM-1252"}, -#line 21 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, "ISO8859-9"}, - {-1}, -#line 34 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, "IBM-943"}, -#line 16 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, "ISO8859-4"}, -#line 13 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, "ISO8859-1"}, - {-1}, {-1}, -#line 38 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, "IBM-1129"}, - {-1}, -#line 30 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, "IBM-869"}, -#line 36 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, "IBM-1124"}, - {-1}, {-1}, -#line 28 "./iconv_open-aix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, "IBM-861"} - }; - -#ifdef __GNUC__ -__inline -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif -#endif -const struct mapping * -mapping_lookup (register const char *str, register unsigned int len) -{ - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - register int key = mapping_hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= 0) - { - register int o = mappings[key].standard_name; - if (o >= 0) - { - register const char *s = o + stringpool; - - if (*str == *s && !strcmp (str + 1, s + 1)) - return &mappings[key]; - } - } - } - return 0; -} diff --git a/lib/iconv_open-hpux.h b/lib/iconv_open-hpux.h deleted file mode 100644 index 8f9f0a9..0000000 --- a/lib/iconv_open-hpux.h +++ /dev/null @@ -1,299 +0,0 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ -/* Command-line: gperf -m 10 ./iconv_open-hpux.gperf */ -/* Computed positions: -k'4,$' */ - -#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ - && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ - && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ - && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ - && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ - && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ - && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ - && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ - && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ - && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ - && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ - && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ - && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ - && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ - && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ - && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ - && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ - && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ - && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ - && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ - && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ - && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ - && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) -/* The character set is not based on ISO-646. */ -#error "gperf generated tables don't work with this execution character set. Please report a bug to ." -#endif - -#line 1 "./iconv_open-hpux.gperf" -struct mapping { int standard_name; const char vendor_name[9 + 1]; }; - -#define TOTAL_KEYWORDS 44 -#define MIN_WORD_LENGTH 4 -#define MAX_WORD_LENGTH 11 -#define MIN_HASH_VALUE 6 -#define MAX_HASH_VALUE 49 -/* maximum key range = 44, duplicates = 0 */ - -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static unsigned int -mapping_hash (register const char *str, register unsigned int len) -{ - static const unsigned char asso_values[] = - { - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 1, 2, - 24, 43, 5, 10, 0, 13, 32, 3, 19, 18, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 5, - 50, 50, 50, 50, 14, 5, 0, 50, 50, 0, - 27, 50, 12, 14, 50, 50, 0, 5, 2, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50 - }; - return len + asso_values[(unsigned char)str[3]+4] + asso_values[(unsigned char)str[len - 1]]; -} - -struct stringpool_t - { - char stringpool_str6[sizeof("CP1256")]; - char stringpool_str7[sizeof("CP1250")]; - char stringpool_str8[sizeof("CP1251")]; - char stringpool_str9[sizeof("CP850")]; - char stringpool_str10[sizeof("TIS-620")]; - char stringpool_str11[sizeof("CP1254")]; - char stringpool_str12[sizeof("ISO-8859-6")]; - char stringpool_str13[sizeof("EUC-TW")]; - char stringpool_str14[sizeof("ISO-8859-1")]; - char stringpool_str15[sizeof("ISO-8859-9")]; - char stringpool_str16[sizeof("CP1255")]; - char stringpool_str17[sizeof("BIG5")]; - char stringpool_str18[sizeof("CP855")]; - char stringpool_str19[sizeof("CP1257")]; - char stringpool_str20[sizeof("EUC-KR")]; - char stringpool_str21[sizeof("CP857")]; - char stringpool_str22[sizeof("ISO-8859-5")]; - char stringpool_str23[sizeof("ISO-8859-15")]; - char stringpool_str24[sizeof("CP866")]; - char stringpool_str25[sizeof("ISO-8859-7")]; - char stringpool_str26[sizeof("CP861")]; - char stringpool_str27[sizeof("CP869")]; - char stringpool_str28[sizeof("CP874")]; - char stringpool_str29[sizeof("CP864")]; - char stringpool_str30[sizeof("CP1252")]; - char stringpool_str31[sizeof("CP437")]; - char stringpool_str32[sizeof("CP852")]; - char stringpool_str33[sizeof("CP775")]; - char stringpool_str34[sizeof("CP865")]; - char stringpool_str35[sizeof("EUC-JP")]; - char stringpool_str36[sizeof("ISO-8859-2")]; - char stringpool_str37[sizeof("SHIFT_JIS")]; - char stringpool_str38[sizeof("CP1258")]; - char stringpool_str39[sizeof("UTF-8")]; - char stringpool_str40[sizeof("HP-KANA8")]; - char stringpool_str41[sizeof("HP-ROMAN8")]; - char stringpool_str42[sizeof("HP-HEBREW8")]; - char stringpool_str43[sizeof("GB2312")]; - char stringpool_str44[sizeof("ISO-8859-8")]; - char stringpool_str45[sizeof("HP-TURKISH8")]; - char stringpool_str46[sizeof("HP-GREEK8")]; - char stringpool_str47[sizeof("HP-ARABIC8")]; - char stringpool_str48[sizeof("CP862")]; - char stringpool_str49[sizeof("CP1253")]; - }; -static const struct stringpool_t stringpool_contents = - { - "CP1256", - "CP1250", - "CP1251", - "CP850", - "TIS-620", - "CP1254", - "ISO-8859-6", - "EUC-TW", - "ISO-8859-1", - "ISO-8859-9", - "CP1255", - "BIG5", - "CP855", - "CP1257", - "EUC-KR", - "CP857", - "ISO-8859-5", - "ISO-8859-15", - "CP866", - "ISO-8859-7", - "CP861", - "CP869", - "CP874", - "CP864", - "CP1252", - "CP437", - "CP852", - "CP775", - "CP865", - "EUC-JP", - "ISO-8859-2", - "SHIFT_JIS", - "CP1258", - "UTF-8", - "HP-KANA8", - "HP-ROMAN8", - "HP-HEBREW8", - "GB2312", - "ISO-8859-8", - "HP-TURKISH8", - "HP-GREEK8", - "HP-ARABIC8", - "CP862", - "CP1253" - }; -#define stringpool ((const char *) &stringpool_contents) - -static const struct mapping mappings[] = - { - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, -#line 40 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "cp1256"}, -#line 34 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, "cp1250"}, -#line 35 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, "cp1251"}, -#line 23 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, "cp850"}, -#line 49 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "tis620"}, -#line 38 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "cp1254"}, -#line 16 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "iso88596"}, -#line 53 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "eucTW"}, -#line 13 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "iso88591"}, -#line 19 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "iso88599"}, -#line 39 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "cp1255"}, -#line 54 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "big5"}, -#line 25 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, "cp855"}, -#line 41 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "cp1257"}, -#line 52 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, "eucKR"}, -#line 26 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, "cp857"}, -#line 15 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, "iso88595"}, -#line 20 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, "iso885915"}, -#line 31 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, "cp866"}, -#line 17 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, "iso88597"}, -#line 27 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, "cp861"}, -#line 32 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, "cp869"}, -#line 33 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, "cp874"}, -#line 29 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, "cp864"}, -#line 36 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, "cp1252"}, -#line 21 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, "cp437"}, -#line 24 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, "cp852"}, -#line 22 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, "cp775"}, -#line 30 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, "cp865"}, -#line 51 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, "eucJP"}, -#line 14 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, "iso88592"}, -#line 55 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str37, "sjis"}, -#line 42 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, "cp1258"}, -#line 56 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str39, "utf8"}, -#line 48 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, "kana8"}, -#line 43 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, "roman8"}, -#line 46 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, "hebrew8"}, -#line 50 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, "hp15CN"}, -#line 18 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, "iso88598"}, -#line 47 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str45, "turkish8"}, -#line 45 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str46, "greek8"}, -#line 44 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, "arabic8"}, -#line 28 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str48, "cp862"}, -#line 37 "./iconv_open-hpux.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str49, "cp1253"} - }; - -#ifdef __GNUC__ -__inline -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif -#endif -const struct mapping * -mapping_lookup (register const char *str, register unsigned int len) -{ - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - register int key = mapping_hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= 0) - { - register int o = mappings[key].standard_name; - if (o >= 0) - { - register const char *s = o + stringpool; - - if (*str == *s && !strcmp (str + 1, s + 1)) - return &mappings[key]; - } - } - } - return 0; -} diff --git a/lib/iconv_open-irix.h b/lib/iconv_open-irix.h deleted file mode 100644 index 520582e..0000000 --- a/lib/iconv_open-irix.h +++ /dev/null @@ -1,199 +0,0 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ -/* Command-line: gperf -m 10 ./iconv_open-irix.gperf */ -/* Computed positions: -k'1,$' */ - -#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ - && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ - && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ - && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ - && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ - && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ - && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ - && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ - && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ - && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ - && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ - && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ - && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ - && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ - && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ - && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ - && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ - && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ - && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ - && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ - && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ - && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ - && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) -/* The character set is not based on ISO-646. */ -#error "gperf generated tables don't work with this execution character set. Please report a bug to ." -#endif - -#line 1 "./iconv_open-irix.gperf" -struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - -#define TOTAL_KEYWORDS 19 -#define MIN_WORD_LENGTH 5 -#define MAX_WORD_LENGTH 11 -#define MIN_HASH_VALUE 5 -#define MAX_HASH_VALUE 23 -/* maximum key range = 19, duplicates = 0 */ - -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static unsigned int -mapping_hash (register const char *str, register unsigned int len) -{ - static const unsigned char asso_values[] = - { - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 8, 2, - 5, 12, 11, 0, 10, 9, 8, 7, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 0, 24, 0, - 24, 5, 24, 0, 24, 7, 24, 24, 24, 24, - 7, 24, 1, 0, 8, 24, 24, 0, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24 - }; - return len + asso_values[(unsigned char)str[len - 1]] + asso_values[(unsigned char)str[0]]; -} - -struct stringpool_t - { - char stringpool_str5[sizeof("CP855")]; - char stringpool_str6[sizeof("EUC-TW")]; - char stringpool_str7[sizeof("EUC-KR")]; - char stringpool_str8[sizeof("CP1251")]; - char stringpool_str9[sizeof("SHIFT_JIS")]; - char stringpool_str10[sizeof("ISO-8859-5")]; - char stringpool_str11[sizeof("ISO-8859-15")]; - char stringpool_str12[sizeof("ISO-8859-1")]; - char stringpool_str13[sizeof("EUC-JP")]; - char stringpool_str14[sizeof("KOI8-R")]; - char stringpool_str15[sizeof("ISO-8859-2")]; - char stringpool_str16[sizeof("GB2312")]; - char stringpool_str17[sizeof("ISO-8859-9")]; - char stringpool_str18[sizeof("ISO-8859-8")]; - char stringpool_str19[sizeof("ISO-8859-7")]; - char stringpool_str20[sizeof("ISO-8859-6")]; - char stringpool_str21[sizeof("ISO-8859-4")]; - char stringpool_str22[sizeof("ISO-8859-3")]; - char stringpool_str23[sizeof("TIS-620")]; - }; -static const struct stringpool_t stringpool_contents = - { - "CP855", - "EUC-TW", - "EUC-KR", - "CP1251", - "SHIFT_JIS", - "ISO-8859-5", - "ISO-8859-15", - "ISO-8859-1", - "EUC-JP", - "KOI8-R", - "ISO-8859-2", - "GB2312", - "ISO-8859-9", - "ISO-8859-8", - "ISO-8859-7", - "ISO-8859-6", - "ISO-8859-4", - "ISO-8859-3", - "TIS-620" - }; -#define stringpool ((const char *) &stringpool_contents) - -static const struct mapping mappings[] = - { - {-1}, {-1}, {-1}, {-1}, {-1}, -#line 24 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str5, "DOS855"}, -#line 29 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "eucTW"}, -#line 28 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, "eucKR"}, -#line 25 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, "WIN1251"}, -#line 30 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, "sjis"}, -#line 17 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "ISO8859-5"}, -#line 22 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "ISO8859-15"}, -#line 13 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "ISO8859-1"}, -#line 27 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "eucJP"}, -#line 23 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "KOI8"}, -#line 14 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "ISO8859-2"}, -#line 26 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "eucCN"}, -#line 21 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "ISO8859-9"}, -#line 20 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, "ISO8859-8"}, -#line 19 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "ISO8859-7"}, -#line 18 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, "ISO8859-6"}, -#line 16 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, "ISO8859-4"}, -#line 15 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, "ISO8859-3"}, -#line 31 "./iconv_open-irix.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, "TIS620"} - }; - -#ifdef __GNUC__ -__inline -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif -#endif -const struct mapping * -mapping_lookup (register const char *str, register unsigned int len) -{ - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - register int key = mapping_hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= 0) - { - register int o = mappings[key].standard_name; - if (o >= 0) - { - register const char *s = o + stringpool; - - if (*str == *s && !strcmp (str + 1, s + 1)) - return &mappings[key]; - } - } - } - return 0; -} diff --git a/lib/iconv_open-osf.h b/lib/iconv_open-osf.h deleted file mode 100644 index 85e4c0f..0000000 --- a/lib/iconv_open-osf.h +++ /dev/null @@ -1,278 +0,0 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ -/* Command-line: gperf -m 10 ./iconv_open-osf.gperf */ -/* Computed positions: -k'4,$' */ - -#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ - && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ - && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ - && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ - && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ - && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ - && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ - && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ - && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ - && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ - && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ - && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ - && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ - && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ - && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ - && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ - && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ - && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ - && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ - && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ - && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ - && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ - && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) -/* The character set is not based on ISO-646. */ -#error "gperf generated tables don't work with this execution character set. Please report a bug to ." -#endif - -#line 1 "./iconv_open-osf.gperf" -struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - -#define TOTAL_KEYWORDS 38 -#define MIN_WORD_LENGTH 4 -#define MAX_WORD_LENGTH 11 -#define MIN_HASH_VALUE 6 -#define MAX_HASH_VALUE 47 -/* maximum key range = 42, duplicates = 0 */ - -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static unsigned int -mapping_hash (register const char *str, register unsigned int len) -{ - static const unsigned char asso_values[] = - { - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 2, 29, - 24, 34, 31, 0, 15, 14, 10, 13, 2, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 7, 48, 48, 48, 48, 48, 48, - 11, 48, 2, 7, 48, 48, 48, 1, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48 - }; - return len + asso_values[(unsigned char)str[3]+3] + asso_values[(unsigned char)str[len - 1]]; -} - -struct stringpool_t - { - char stringpool_str6[sizeof("CP1255")]; - char stringpool_str7[sizeof("CP775")]; - char stringpool_str8[sizeof("CP1250")]; - char stringpool_str9[sizeof("EUC-TW")]; - char stringpool_str10[sizeof("EUC-KR")]; - char stringpool_str11[sizeof("TIS-620")]; - char stringpool_str12[sizeof("ISO-8859-5")]; - char stringpool_str13[sizeof("ISO-8859-15")]; - char stringpool_str14[sizeof("BIG5")]; - char stringpool_str15[sizeof("CP855")]; - char stringpool_str16[sizeof("CP1258")]; - char stringpool_str17[sizeof("CP850")]; - char stringpool_str18[sizeof("CP865")]; - char stringpool_str19[sizeof("EUC-JP")]; - char stringpool_str20[sizeof("CP1257")]; - char stringpool_str21[sizeof("CP1256")]; - char stringpool_str22[sizeof("ISO-8859-8")]; - char stringpool_str23[sizeof("SHIFT_JIS")]; - char stringpool_str25[sizeof("ISO-8859-9")]; - char stringpool_str26[sizeof("ISO-8859-7")]; - char stringpool_str27[sizeof("ISO-8859-6")]; - char stringpool_str29[sizeof("CP857")]; - char stringpool_str30[sizeof("CP1252")]; - char stringpool_str31[sizeof("CP869")]; - char stringpool_str32[sizeof("CP949")]; - char stringpool_str33[sizeof("CP866")]; - char stringpool_str34[sizeof("CP437")]; - char stringpool_str35[sizeof("CP1251")]; - char stringpool_str36[sizeof("ISO-8859-2")]; - char stringpool_str37[sizeof("CP1254")]; - char stringpool_str38[sizeof("CP874")]; - char stringpool_str39[sizeof("CP852")]; - char stringpool_str40[sizeof("CP1253")]; - char stringpool_str41[sizeof("ISO-8859-1")]; - char stringpool_str42[sizeof("CP862")]; - char stringpool_str43[sizeof("ISO-8859-4")]; - char stringpool_str46[sizeof("ISO-8859-3")]; - char stringpool_str47[sizeof("CP861")]; - }; -static const struct stringpool_t stringpool_contents = - { - "CP1255", - "CP775", - "CP1250", - "EUC-TW", - "EUC-KR", - "TIS-620", - "ISO-8859-5", - "ISO-8859-15", - "BIG5", - "CP855", - "CP1258", - "CP850", - "CP865", - "EUC-JP", - "CP1257", - "CP1256", - "ISO-8859-8", - "SHIFT_JIS", - "ISO-8859-9", - "ISO-8859-7", - "ISO-8859-6", - "CP857", - "CP1252", - "CP869", - "CP949", - "CP866", - "CP437", - "CP1251", - "ISO-8859-2", - "CP1254", - "CP874", - "CP852", - "CP1253", - "ISO-8859-1", - "CP862", - "ISO-8859-4", - "ISO-8859-3", - "CP861" - }; -#define stringpool ((const char *) &stringpool_contents) - -static const struct mapping mappings[] = - { - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, -#line 41 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "cp1255"}, -#line 24 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, "cp775"}, -#line 36 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, "cp1250"}, -#line 47 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, "eucTW"}, -#line 46 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "eucKR"}, -#line 50 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "TACTIS"}, -#line 17 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "ISO8859-5"}, -#line 22 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "ISO8859-15"}, -#line 48 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "big5"}, -#line 27 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "cp855"}, -#line 44 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "cp1258"}, -#line 25 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "cp850"}, -#line 31 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, "cp865"}, -#line 45 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "eucJP"}, -#line 43 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, "cp1257"}, -#line 42 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, "cp1256"}, -#line 20 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, "ISO8859-8"}, -#line 49 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, "SJIS"}, - {-1}, -#line 21 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, "ISO8859-9"}, -#line 19 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, "ISO8859-7"}, -#line 18 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, "ISO8859-6"}, - {-1}, -#line 28 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, "cp857"}, -#line 38 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, "cp1252"}, -#line 33 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, "cp869"}, -#line 35 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, "KSC5601"}, -#line 32 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, "cp866"}, -#line 23 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, "cp437"}, -#line 37 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, "cp1251"}, -#line 14 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, "ISO8859-2"}, -#line 40 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str37, "cp1254"}, -#line 34 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, "cp874"}, -#line 26 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str39, "cp852"}, -#line 39 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, "cp1253"}, -#line 13 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, "ISO8859-1"}, -#line 30 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, "cp862"}, -#line 16 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, "ISO8859-4"}, - {-1}, {-1}, -#line 15 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str46, "ISO8859-3"}, -#line 29 "./iconv_open-osf.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, "cp861"} - }; - -#ifdef __GNUC__ -__inline -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif -#endif -const struct mapping * -mapping_lookup (register const char *str, register unsigned int len) -{ - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - register int key = mapping_hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= 0) - { - register int o = mappings[key].standard_name; - if (o >= 0) - { - register const char *s = o + stringpool; - - if (*str == *s && !strcmp (str + 1, s + 1)) - return &mappings[key]; - } - } - } - return 0; -} diff --git a/lib/iconv_open-solaris.h b/lib/iconv_open-solaris.h deleted file mode 100644 index 2963145..0000000 --- a/lib/iconv_open-solaris.h +++ /dev/null @@ -1,190 +0,0 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ -/* Command-line: gperf -m 10 ./iconv_open-solaris.gperf */ -/* Computed positions: -k'10' */ - -#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ - && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ - && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ - && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ - && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ - && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ - && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ - && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ - && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ - && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ - && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ - && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ - && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ - && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ - && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ - && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ - && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ - && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ - && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ - && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ - && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ - && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ - && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) -/* The character set is not based on ISO-646. */ -#error "gperf generated tables don't work with this execution character set. Please report a bug to ." -#endif - -#line 1 "./iconv_open-solaris.gperf" -struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - -#define TOTAL_KEYWORDS 13 -#define MIN_WORD_LENGTH 5 -#define MAX_WORD_LENGTH 11 -#define MIN_HASH_VALUE 5 -#define MAX_HASH_VALUE 19 -/* maximum key range = 15, duplicates = 0 */ - -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static unsigned int -mapping_hash (register const char *str, register unsigned int len) -{ - static const unsigned char asso_values[] = - { - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 0, - 9, 8, 7, 6, 5, 4, 3, 2, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20 - }; - register int hval = len; - - switch (hval) - { - default: - hval += asso_values[(unsigned char)str[9]]; - /*FALLTHROUGH*/ - case 9: - case 8: - case 7: - case 6: - case 5: - break; - } - return hval; -} - -struct stringpool_t - { - char stringpool_str5[sizeof("ASCII")]; - char stringpool_str6[sizeof("CP1251")]; - char stringpool_str7[sizeof("$ abc")]; - char stringpool_str10[sizeof("ISO-8859-1")]; - char stringpool_str11[sizeof("ISO-8859-15")]; - char stringpool_str12[sizeof("ISO-8859-9")]; - char stringpool_str13[sizeof("ISO-8859-8")]; - char stringpool_str14[sizeof("ISO-8859-7")]; - char stringpool_str15[sizeof("ISO-8859-6")]; - char stringpool_str16[sizeof("ISO-8859-5")]; - char stringpool_str17[sizeof("ISO-8859-4")]; - char stringpool_str18[sizeof("ISO-8859-3")]; - char stringpool_str19[sizeof("ISO-8859-2")]; - }; -static const struct stringpool_t stringpool_contents = - { - "ASCII", - "CP1251", - "$ abc", - "ISO-8859-1", - "ISO-8859-15", - "ISO-8859-9", - "ISO-8859-8", - "ISO-8859-7", - "ISO-8859-6", - "ISO-8859-5", - "ISO-8859-4", - "ISO-8859-3", - "ISO-8859-2" - }; -#define stringpool ((const char *) &stringpool_contents) - -static const struct mapping mappings[] = - { - {-1}, {-1}, {-1}, {-1}, {-1}, -#line 19 "./iconv_open-solaris.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str5, "646"}, -#line 30 "./iconv_open-solaris.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "ansi-1251"}, -#line 18 "./iconv_open-solaris.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str7}, - {-1}, {-1}, -#line 20 "./iconv_open-solaris.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "ISO8859-1"}, -#line 29 "./iconv_open-solaris.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "ISO8859-15"}, -#line 28 "./iconv_open-solaris.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "ISO8859-9"}, -#line 27 "./iconv_open-solaris.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "ISO8859-8"}, -#line 26 "./iconv_open-solaris.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "ISO8859-7"}, -#line 25 "./iconv_open-solaris.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "ISO8859-6"}, -#line 24 "./iconv_open-solaris.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "ISO8859-5"}, -#line 23 "./iconv_open-solaris.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "ISO8859-4"}, -#line 22 "./iconv_open-solaris.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, "ISO8859-3"}, -#line 21 "./iconv_open-solaris.gperf" - {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "ISO8859-2"} - }; - -#ifdef __GNUC__ -__inline -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif -#endif -const struct mapping * -mapping_lookup (register const char *str, register unsigned int len) -{ - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - register int key = mapping_hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= 0) - { - register int o = mappings[key].standard_name; - if (o >= 0) - { - register const char *s = o + stringpool; - - if (*str == *s && !strcmp (str + 1, s + 1)) - return &mappings[key]; - } - } - } - return 0; -} diff --git a/lib/iconv_open.c b/lib/iconv_open.c index 7653617..37ce9ce 100644 --- a/lib/iconv_open.c +++ b/lib/iconv_open.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/localcharset.c b/lib/localcharset.c index 113205d..a928867 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -1,6 +1,6 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2006, 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ #include #if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET -# define DARWIN7 /* Darwin 7 or newer, i.e. MacOS X 10.3 or newer */ +# define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */ #endif #if defined _WIN32 || defined __WIN32__ @@ -65,6 +65,11 @@ # include #endif +/* For MB_CUR_MAX_L */ +#if defined DARWIN7 +# include +#endif + #if ENABLE_RELOCATABLE # include "relocatable.h" #else @@ -542,5 +547,12 @@ locale_charset (void) if (codeset[0] == '\0') codeset = "ASCII"; +#ifdef DARWIN7 + /* Mac OS X sets MB_CUR_MAX to 1 when LC_ALL=C, and "UTF-8" + (the default codeset) does not work when MB_CUR_MAX is 1. */ + if (strcmp (codeset, "UTF-8") == 0 && MB_CUR_MAX_L (uselocale (NULL)) <= 1) + codeset = "ASCII"; +#endif + return codeset; } diff --git a/lib/localcharset.h b/lib/localcharset.h index 39dc593..9011d58 100644 --- a/lib/localcharset.h +++ b/lib/localcharset.h @@ -1,5 +1,5 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2003, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU CHARSET Library. This program is free software; you can redistribute it and/or modify diff --git a/lib/locale.in.h b/lib/locale.in.h index 7747902..10cc44b 100644 --- a/lib/locale.in.h +++ b/lib/locale.in.h @@ -1,5 +1,5 @@ /* A POSIX . - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,23 +14,37 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef _@GUARD_PREFIX@_LOCALE_H - #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ +#ifdef _GL_ALREADY_INCLUDING_LOCALE_H + +/* Special invocation conventions to handle Solaris header files + (through Solaris 10) when combined with gettext's libintl.h. */ + +#@INCLUDE_NEXT@ @NEXT_LOCALE_H@ + +#else +/* Normal invocation convention. */ + +#ifndef _@GUARD_PREFIX@_LOCALE_H + +#define _GL_ALREADY_INCLUDING_LOCALE_H + /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_LOCALE_H@ +#undef _GL_ALREADY_INCLUDING_LOCALE_H + #ifndef _@GUARD_PREFIX@_LOCALE_H #define _@GUARD_PREFIX@_LOCALE_H /* NetBSD 5.0 mis-defines NULL. */ #include -/* MacOS X 10.5 defines the locale_t type in . */ +/* Mac OS X 10.5 defines the locale_t type in . */ #if @HAVE_XLOCALE_H@ # include #endif @@ -198,4 +212,5 @@ _GL_WARN_ON_USE (duplocale, "duplocale is buggy on some glibc systems - " #endif #endif /* _@GUARD_PREFIX@_LOCALE_H */ +#endif /* ! _GL_ALREADY_INCLUDING_LOCALE_H */ #endif /* _@GUARD_PREFIX@_LOCALE_H */ diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c index e3f354b..5743f43 100644 --- a/lib/mbrtowc.c +++ b/lib/mbrtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -328,7 +328,7 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) size_t rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) { -# if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG +# if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG if (s == NULL) { pwc = NULL; @@ -337,6 +337,11 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) } # endif +# if MBRTOWC_EMPTY_INPUT_BUG + if (n == 0) + return (size_t) -2; +# endif + # if MBRTOWC_RETVAL_BUG { static mbstate_t internal_state; diff --git a/lib/mbsinit.c b/lib/mbsinit.c index 638142e..df4bcd1 100644 --- a/lib/mbsinit.c +++ b/lib/mbsinit.c @@ -1,5 +1,5 @@ /* Test for initial conversion state. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbsrtowcs-impl.h b/lib/mbsrtowcs-impl.h index 019bc33..d42af01 100644 --- a/lib/mbsrtowcs-impl.h +++ b/lib/mbsrtowcs-impl.h @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbsrtowcs-state.c b/lib/mbsrtowcs-state.c index bf246eb..2a7019a 100644 --- a/lib/mbsrtowcs-state.c +++ b/lib/mbsrtowcs-state.c @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -22,7 +22,7 @@ /* Internal state used by the functions mbsrtowcs() and mbsnrtowcs(). */ mbstate_t _gl_mbsrtowcs_state /* The state must initially be in the "initial state"; so, zero-initialize it. - On most systems, putting it into BSS is sufficient. Not so on MacOS X 10.3, + On most systems, putting it into BSS is sufficient. Not so on Mac OS X 10.3, see . When it needs an initializer, use 0 or {0} as initializer? 0 only works when mbstate_t is a scalar type (such as when gnulib defines it, or on diff --git a/lib/mbsrtowcs.c b/lib/mbsrtowcs.c index e3ec876..136ec34 100644 --- a/lib/mbsrtowcs.c +++ b/lib/mbsrtowcs.c @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbtowc-impl.h b/lib/mbtowc-impl.h index bb75ed2..3cc70b0 100644 --- a/lib/mbtowc-impl.h +++ b/lib/mbtowc-impl.h @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbtowc.c b/lib/mbtowc.c index 97eab4e..93a7445 100644 --- a/lib/mbtowc.c +++ b/lib/mbtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/memchr.c b/lib/memchr.c index b8fb0ef..6709f6e 100644 --- a/lib/memchr.c +++ b/lib/memchr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2012 +/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2014 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), diff --git a/lib/ref-add.sin b/lib/ref-add.sin index 4ec043f..0e14022 100644 --- a/lib/ref-add.sin +++ b/lib/ref-add.sin @@ -1,6 +1,6 @@ # Add this package to a list of references stored in a text file. # -# Copyright (C) 2000, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/ref-del.sin b/lib/ref-del.sin index eb03881..2dbcf7b 100644 --- a/lib/ref-del.sin +++ b/lib/ref-del.sin @@ -1,6 +1,6 @@ # Remove this package from a list of references stored in a text file. # -# Copyright (C) 2000, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h index ed1f9aa..651e8df 100644 --- a/lib/stdbool.in.h +++ b/lib/stdbool.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2003, 2006-2012 Free Software Foundation, Inc. +/* Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software; you can redistribute it and/or modify @@ -66,24 +66,19 @@ # undef true #endif -/* For the sake of symbolic names in gdb, we define true and false as - enum constants, not only as macros. - It is tempting to write - typedef enum { false = 0, true = 1 } _Bool; - so that gdb prints values of type 'bool' symbolically. But if we do - this, values of type '_Bool' may promote to 'int' or 'unsigned int' - (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' - (see ISO C 99 6.3.1.1.(2)). So we add a negative value to the - enum; this ensures that '_Bool' promotes to 'int'. */ -#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__) +#ifdef __cplusplus +# define _Bool bool +# define bool bool +#else +# if defined __BEOS__ && !defined __HAIKU__ /* A compiler known to have 'bool'. */ /* If the compiler already has both 'bool' and '_Bool', we can assume they are the same types. */ -# if !@HAVE__BOOL@ +# if !@HAVE__BOOL@ typedef bool _Bool; -# endif -#else -# if !defined __GNUC__ +# endif +# else +# if !defined __GNUC__ /* If @HAVE__BOOL@: Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when the built-in _Bool type is used. See @@ -103,19 +98,35 @@ typedef bool _Bool; "Invalid enumerator. (badenum)" with HP-UX cc on Tru64. The only benefit of the enum, debuggability, is not important with these compilers. So use 'signed char' and no enum. */ -# define _Bool signed char -# else +# define _Bool signed char +# else /* With this compiler, trust the _Bool type if the compiler has it. */ -# if !@HAVE__BOOL@ +# if !@HAVE__BOOL@ + /* For the sake of symbolic names in gdb, define true and false as + enum constants, not only as macros. + It is tempting to write + typedef enum { false = 0, true = 1 } _Bool; + so that gdb prints values of type 'bool' symbolically. But then + values of type '_Bool' might promote to 'int' or 'unsigned int' + (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' + (see ISO C 99 6.3.1.1.(2)). So add a negative value to the + enum; this ensures that '_Bool' promotes to 'int'. */ typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool; +# endif # endif # endif +# define bool _Bool #endif -#define bool _Bool /* The other macros must be usable in preprocessor directives. */ -#define false 0 -#define true 1 +#ifdef __cplusplus +# define false false +# define true true +#else +# define false 0 +# define true 1 +#endif + #define __bool_true_false_are_defined 1 #endif /* _GL_STDBOOL_H */ diff --git a/lib/stddef.in.h b/lib/stddef.in.h index 17fcaea..f5c0e05 100644 --- a/lib/stddef.in.h +++ b/lib/stddef.in.h @@ -1,6 +1,6 @@ /* A substitute for POSIX 2008 , for platforms that have issues. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/stdint.in.h b/lib/stdint.in.h index 59c00d5..247f0d8 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2002, 2004-2012 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2014 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. @@ -38,8 +38,7 @@ other system header files; just include the system's . Ideally we should test __BIONIC__ here, but it is only defined after has been included; hence test __ANDROID__ instead. */ -#if defined __ANDROID__ \ - && defined _SYS_TYPES_H_ && !defined _SSIZE_T_DEFINED_ +#if defined __ANDROID__ && defined _GL_INCLUDING_SYS_TYPES_H # @INCLUDE_NEXT@ @NEXT_STDINT_H@ #else @@ -83,7 +82,7 @@ /* defines some of the stdint.h types as well, on glibc, IRIX 6.5, and OpenBSD 3.8 (via ). AIX 5.2 isn't needed and causes troubles. - MacOS X 10.4.6 includes (which is us), but + Mac OS X 10.4.6 includes (which is us), but relies on the system definitions, so include after @NEXT_STDINT_H@. */ #if @HAVE_SYS_TYPES_H@ && ! defined _AIX diff --git a/lib/stdio.in.h b/lib/stdio.in.h index b1b543d..1e1fe84 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -124,6 +124,15 @@ #define _GL_STDIO_STRINGIZE(token) #token #define _GL_STDIO_MACROEXPAND_AND_STRINGIZE(token) _GL_STDIO_STRINGIZE(token) +/* When also using extern inline, suppress the use of static inline in + standard headers of problematic Apple configurations, as Libc at + least through Libc-825.26 (2013-04-09) mishandles it; see, e.g., + . + Perhaps Apple will fix this some day. */ +#if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \ + && defined __GNUC__ && defined __STDC__) +# undef putc_unlocked +#endif #if @GNULIB_DPRINTF@ # if @REPLACE_DPRINTF@ @@ -575,21 +584,27 @@ _GL_CXXALIAS_RPL (fwrite, size_t, _GL_CXXALIAS_SYS (fwrite, size_t, (const void *ptr, size_t s, size_t n, FILE *stream)); -/* Work around glibc bug 11959 +/* Work around bug 11959 when fortifying glibc 2.4 through 2.15 , which sometimes causes an unwanted diagnostic for fwrite calls. - This affects only function declaration attributes, so it's not - needed for C++. */ -# if !defined __cplusplus && 0 < __USE_FORTIFY_LEVEL -static inline size_t _GL_ARG_NONNULL ((1, 4)) -rpl_fwrite (const void *ptr, size_t s, size_t n, FILE *stream) -{ - size_t r = fwrite (ptr, s, n, stream); - (void) r; - return r; -} + This affects only function declaration attributes under certain + versions of gcc and clang, and is not needed for C++. */ +# if (0 < __USE_FORTIFY_LEVEL \ + && __GLIBC__ == 2 && 4 <= __GLIBC_MINOR__ && __GLIBC_MINOR__ <= 15 \ + && 3 < __GNUC__ + (4 <= __GNUC_MINOR__) \ + && !defined __cplusplus) # undef fwrite +# undef fwrite_unlocked +extern size_t __REDIRECT (rpl_fwrite, + (const void *__restrict, size_t, size_t, + FILE *__restrict), + fwrite); +extern size_t __REDIRECT (rpl_fwrite_unlocked, + (const void *__restrict, size_t, size_t, + FILE *__restrict), + fwrite_unlocked); # define fwrite rpl_fwrite +# define fwrite_unlocked rpl_fwrite_unlocked # endif # endif _GL_CXXALIASWARN (fwrite); @@ -1333,7 +1348,6 @@ _GL_WARN_ON_USE (vsprintf, "vsprintf is not always POSIX compliant - " "POSIX compliance"); #endif - #endif /* _@GUARD_PREFIX@_STDIO_H */ #endif /* _@GUARD_PREFIX@_STDIO_H */ #endif diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index b546133..46e10db 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 1995, 2001-2004, 2006-2012 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,8 +20,9 @@ #endif @PRAGMA_COLUMNS@ -#if defined __need_malloc_and_calloc -/* Special invocation convention inside glibc header files. */ +#if defined __need_system_stdlib_h || defined __need_malloc_and_calloc +/* Special invocation conventions inside some gnulib header files, + and inside some glibc header files, respectively. */ #@INCLUDE_NEXT@ @NEXT_STDLIB_H@ @@ -87,8 +88,8 @@ struct random_data #endif #if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) -/* On MacOS X 10.3, only declares mkstemp. */ -/* On MacOS X 10.5, only declares mkstemps. */ +/* On Mac OS X 10.3, only declares mkstemp. */ +/* On Mac OS X 10.5, only declares mkstemps. */ /* On Cygwin 1.7.1, only declares getsubopt. */ /* But avoid namespace pollution on glibc systems and native Windows. */ # include @@ -457,10 +458,19 @@ _GL_WARN_ON_USE (posix_openpt, "posix_openpt is not portable - " #if @GNULIB_PTSNAME@ /* Return the pathname of the pseudo-terminal slave associated with the master FD is open on, or NULL on errors. */ -# if !@HAVE_PTSNAME@ +# if @REPLACE_PTSNAME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef ptsname +# define ptsname rpl_ptsname +# endif +_GL_FUNCDECL_RPL (ptsname, char *, (int fd)); +_GL_CXXALIAS_RPL (ptsname, char *, (int fd)); +# else +# if !@HAVE_PTSNAME@ _GL_FUNCDECL_SYS (ptsname, char *, (int fd)); -# endif +# endif _GL_CXXALIAS_SYS (ptsname, char *, (int fd)); +# endif _GL_CXXALIASWARN (ptsname); #elif defined GNULIB_POSIXCHECK # undef ptsname @@ -757,6 +767,22 @@ _GL_WARN_ON_USE (rpmatch, "rpmatch is unportable - " # endif #endif +#if @GNULIB_SECURE_GETENV@ +/* Look up NAME in the environment, returning 0 in insecure situations. */ +# if !@HAVE_SECURE_GETENV@ +_GL_FUNCDECL_SYS (secure_getenv, char *, + (char const *name) _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (secure_getenv, char *, (char const *name)); +_GL_CXXALIASWARN (secure_getenv); +#elif defined GNULIB_POSIXCHECK +# undef secure_getenv +# if HAVE_RAW_DECL_SECURE_GETENV +_GL_WARN_ON_USE (secure_getenv, "secure_getenv is unportable - " + "use gnulib module secure_getenv for portability"); +# endif +#endif + #if @GNULIB_SETENV@ /* Set NAME to VALUE in the environment. If REPLACE is nonzero, overwrite an existing value. */ diff --git a/lib/str-two-way.h b/lib/str-two-way.h index af8f77b..49ee746 100644 --- a/lib/str-two-way.h +++ b/lib/str-two-way.h @@ -1,5 +1,5 @@ /* Byte-wise substring search, using the Two-Way algorithm. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Eric Blake , 2008. diff --git a/lib/streq.h b/lib/streq.h index b312f7f..0e62fb9 100644 --- a/lib/streq.h +++ b/lib/streq.h @@ -1,5 +1,5 @@ /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/lib/striconv.c b/lib/striconv.c index 4458d0c..2495d81 100644 --- a/lib/striconv.c +++ b/lib/striconv.c @@ -1,5 +1,5 @@ /* Charset conversion. - Copyright (C) 2001-2007, 2010-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2010-2014 Free Software Foundation, Inc. Written by Bruno Haible and Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/lib/striconv.h b/lib/striconv.h index fc3aa69..5747731 100644 --- a/lib/striconv.h +++ b/lib/striconv.h @@ -1,5 +1,5 @@ /* Charset conversion. - Copyright (C) 2001-2004, 2006-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc. Written by Bruno Haible and Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/lib/string.in.h b/lib/string.in.h index f8d7520..9062142 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 1995-1996, 2001-2012 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/strnlen1.c b/lib/strnlen1.c index 52dc507..363776a 100644 --- a/lib/strnlen1.c +++ b/lib/strnlen1.c @@ -1,5 +1,5 @@ /* Find the length of STRING + 1, but scan at most MAXLEN bytes. - Copyright (C) 2005-2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/strnlen1.h b/lib/strnlen1.h index 4c4f0c0..b2f956f 100644 --- a/lib/strnlen1.h +++ b/lib/strnlen1.h @@ -1,5 +1,5 @@ /* Find the length of STRING + 1, but scan at most MAXLEN bytes. - Copyright (C) 2005, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/strstr.c b/lib/strstr.c index 94d6252..d5b9d78 100644 --- a/lib/strstr.c +++ b/lib/strstr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2012 Free Software +/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index 2efc1e9..b47a7ff 100644 --- a/lib/sys_stat.in.h +++ b/lib/sys_stat.in.h @@ -1,5 +1,5 @@ /* Provide a more complete sys/stat header file. - Copyright (C) 2005-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -150,6 +150,10 @@ # endif #endif +#ifndef S_ISMPX /* AIX */ +# define S_ISMPX(m) 0 +#endif + #ifndef S_ISNAM /* Xenix */ # ifdef S_IFNAM # define S_ISNAM(m) (((m) & S_IFMT) == S_IFNAM) @@ -497,7 +501,7 @@ _GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode)); # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ # if !GNULIB_defined_rpl_mkdir -static inline int +static int rpl_mkdir (char const *name, mode_t mode) { return _mkdir (name); diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index d915cee..30057ad 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/time.h. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,37 +17,43 @@ /* Written by Paul Eggert. */ +#ifndef _@GUARD_PREFIX@_SYS_TIME_H + #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ -#if defined _@GUARD_PREFIX@_SYS_TIME_H - -/* Simply delegate to the system's header, without adding anything. */ -# if @HAVE_SYS_TIME_H@ -# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ -# endif - +/* On Cygwin and on many BSDish systems, includes itself + recursively via . + Simply delegate to the system's header in this case; it is a no-op. + Without this extra ifdef, the C++ gettimeofday declaration below + would be a forward declaration in gnulib's nested . */ +#if defined _CYGWIN_SYS_TIME_H || defined _SYS_TIME_H || defined _SYS_TIME_H_ +# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ #else -# define _@GUARD_PREFIX@_SYS_TIME_H +/* The include_next requires a split double-inclusion guard. */ +#if @HAVE_SYS_TIME_H@ +# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ +#endif -# if @HAVE_SYS_TIME_H@ -# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ -# else -# include -# endif +#ifndef _@GUARD_PREFIX@_SYS_TIME_H +#define _@GUARD_PREFIX@_SYS_TIME_H + +#if ! @HAVE_SYS_TIME_H@ +# include +#endif /* On native Windows with MSVC, get the 'struct timeval' type. Also, on native Windows with a 64-bit time_t, where we are overriding the 'struct timeval' type, get all declarations of system functions whose signature contains 'struct timeval'. */ -# if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H -# define _GL_INCLUDING_WINSOCK2_H -# include -# undef _GL_INCLUDING_WINSOCK2_H -# endif +#if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H +# define _GL_INCLUDING_WINSOCK2_H +# include +# undef _GL_INCLUDING_WINSOCK2_H +#endif /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ @@ -55,112 +61,112 @@ /* The definition of _GL_WARN_ON_USE is copied here. */ -# ifdef __cplusplus +#ifdef __cplusplus extern "C" { +#endif + +#if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@ + +# if @REPLACE_STRUCT_TIMEVAL@ +# define timeval rpl_timeval # endif -# if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@ - -# if @REPLACE_STRUCT_TIMEVAL@ -# define timeval rpl_timeval -# endif - -# if !GNULIB_defined_struct_timeval +# if !GNULIB_defined_struct_timeval struct timeval { time_t tv_sec; long int tv_usec; }; -# define GNULIB_defined_struct_timeval 1 -# endif - +# define GNULIB_defined_struct_timeval 1 # endif -# ifdef __cplusplus +#endif + +#ifdef __cplusplus } -# endif +#endif -# if @GNULIB_GETTIMEOFDAY@ -# if @REPLACE_GETTIMEOFDAY@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef gettimeofday -# define gettimeofday rpl_gettimeofday -# endif +#if @GNULIB_GETTIMEOFDAY@ +# if @REPLACE_GETTIMEOFDAY@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef gettimeofday +# define gettimeofday rpl_gettimeofday +# endif _GL_FUNCDECL_RPL (gettimeofday, int, (struct timeval *restrict, void *restrict) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (gettimeofday, int, (struct timeval *restrict, void *restrict)); -# else -# if !@HAVE_GETTIMEOFDAY@ +# else +# if !@HAVE_GETTIMEOFDAY@ _GL_FUNCDECL_SYS (gettimeofday, int, (struct timeval *restrict, void *restrict) _GL_ARG_NONNULL ((1))); -# endif +# endif /* Need to cast, because on glibc systems, by default, the second argument is struct timezone *. */ _GL_CXXALIAS_SYS_CAST (gettimeofday, int, (struct timeval *restrict, void *restrict)); -# endif +# endif _GL_CXXALIASWARN (gettimeofday); -# elif defined GNULIB_POSIXCHECK -# undef gettimeofday -# if HAVE_RAW_DECL_GETTIMEOFDAY +#elif defined GNULIB_POSIXCHECK +# undef gettimeofday +# if HAVE_RAW_DECL_GETTIMEOFDAY _GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - " "use gnulib module gettimeofday for portability"); -# endif # endif +#endif /* Hide some function declarations from . */ -# if defined _MSC_VER && @HAVE_WINSOCK2_H@ -# if !defined _@GUARD_PREFIX@_UNISTD_H -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef close -# define close close_used_without_including_unistd_h -# else +#if defined _MSC_VER && @HAVE_WINSOCK2_H@ +# if !defined _@GUARD_PREFIX@_UNISTD_H +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef close +# define close close_used_without_including_unistd_h +# else _GL_WARN_ON_USE (close, "close() used without including "); -# endif -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef gethostname -# define gethostname gethostname_used_without_including_unistd_h -# else +# endif +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef gethostname +# define gethostname gethostname_used_without_including_unistd_h +# else _GL_WARN_ON_USE (gethostname, "gethostname() used without including "); -# endif # endif -# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef socket -# define socket socket_used_without_including_sys_socket_h -# undef connect -# define connect connect_used_without_including_sys_socket_h -# undef accept -# define accept accept_used_without_including_sys_socket_h -# undef bind -# define bind bind_used_without_including_sys_socket_h -# undef getpeername -# define getpeername getpeername_used_without_including_sys_socket_h -# undef getsockname -# define getsockname getsockname_used_without_including_sys_socket_h -# undef getsockopt -# define getsockopt getsockopt_used_without_including_sys_socket_h -# undef listen -# define listen listen_used_without_including_sys_socket_h -# undef recv -# define recv recv_used_without_including_sys_socket_h -# undef send -# define send send_used_without_including_sys_socket_h -# undef recvfrom -# define recvfrom recvfrom_used_without_including_sys_socket_h -# undef sendto -# define sendto sendto_used_without_including_sys_socket_h -# undef setsockopt -# define setsockopt setsockopt_used_without_including_sys_socket_h -# undef shutdown -# define shutdown shutdown_used_without_including_sys_socket_h -# else +# endif +# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef socket +# define socket socket_used_without_including_sys_socket_h +# undef connect +# define connect connect_used_without_including_sys_socket_h +# undef accept +# define accept accept_used_without_including_sys_socket_h +# undef bind +# define bind bind_used_without_including_sys_socket_h +# undef getpeername +# define getpeername getpeername_used_without_including_sys_socket_h +# undef getsockname +# define getsockname getsockname_used_without_including_sys_socket_h +# undef getsockopt +# define getsockopt getsockopt_used_without_including_sys_socket_h +# undef listen +# define listen listen_used_without_including_sys_socket_h +# undef recv +# define recv recv_used_without_including_sys_socket_h +# undef send +# define send send_used_without_including_sys_socket_h +# undef recvfrom +# define recvfrom recvfrom_used_without_including_sys_socket_h +# undef sendto +# define sendto sendto_used_without_including_sys_socket_h +# undef setsockopt +# define setsockopt setsockopt_used_without_including_sys_socket_h +# undef shutdown +# define shutdown shutdown_used_without_including_sys_socket_h +# else _GL_WARN_ON_USE (socket, "socket() used without including "); _GL_WARN_ON_USE (connect, @@ -189,17 +195,19 @@ _GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - " "setsockopt() used without including "); _GL_WARN_ON_USE (shutdown, "shutdown() used without including "); -# endif -# endif -# if !defined _@GUARD_PREFIX@_SYS_SELECT_H -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef select -# define select select_used_without_including_sys_select_h -# else - _GL_WARN_ON_USE (select, - "select() used without including "); -# endif # endif # endif +# if !defined _@GUARD_PREFIX@_SYS_SELECT_H +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef select +# define select select_used_without_including_sys_select_h +# else + _GL_WARN_ON_USE (select, + "select() used without including "); +# endif +# endif +#endif #endif /* _@GUARD_PREFIX@_SYS_TIME_H */ +#endif /* _CYGWIN_SYS_TIME_H */ +#endif /* _@GUARD_PREFIX@_SYS_TIME_H */ diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h index 8139d98..deb5d67 100644 --- a/lib/sys_types.in.h +++ b/lib/sys_types.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/types.h. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,9 @@ #ifndef _@GUARD_PREFIX@_SYS_TYPES_H /* The include_next requires a split double-inclusion guard. */ +# define _GL_INCLUDING_SYS_TYPES_H #@INCLUDE_NEXT@ @NEXT_SYS_TYPES_H@ +# undef _GL_INCLUDING_SYS_TYPES_H #ifndef _@GUARD_PREFIX@_SYS_TYPES_H #define _@GUARD_PREFIX@_SYS_TYPES_H diff --git a/lib/time.in.h b/lib/time.in.h index 04cde05..81abdf4 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -1,6 +1,6 @@ /* A more-standard . - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -48,20 +48,13 @@ /* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3). Or they define it with the wrong member names or define it in - (e.g., FreeBSD circa 1997). Stock Mingw does not define it, but the - pthreads-win32 library defines it in . */ + (e.g., FreeBSD circa 1997). Stock Mingw prior to 3.0 does not define it, + but the pthreads-win32 library defines it in . */ # if ! @TIME_H_DEFINES_STRUCT_TIMESPEC@ # if @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ # include # elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ # include -/* The pthreads-win32 also defines a couple of broken macros. */ -# undef asctime_r -# undef ctime_r -# undef gmtime_r -# undef localtime_r -# undef rand_r -# undef strtok_r # else # ifdef __cplusplus @@ -187,6 +180,39 @@ _GL_CXXALIASWARN (gmtime_r); # endif # endif +/* Convert TIMER to RESULT, assuming local time and UTC respectively. See + and + . */ +# if @GNULIB_GETTIMEOFDAY@ +# if @REPLACE_LOCALTIME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef localtime +# define localtime rpl_localtime +# endif +_GL_FUNCDECL_RPL (localtime, struct tm *, (time_t const *__timer) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (localtime, struct tm *, (time_t const *__timer)); +# else +_GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer)); +# endif +_GL_CXXALIASWARN (localtime); +# endif + +# if @GNULIB_GETTIMEOFDAY@ +# if @REPLACE_GMTIME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef gmtime +# define gmtime rpl_gmtime +# endif +_GL_FUNCDECL_RPL (gmtime, struct tm *, (time_t const *__timer) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (gmtime, struct tm *, (time_t const *__timer)); +# else +_GL_CXXALIAS_SYS (gmtime, struct tm *, (time_t const *__timer)); +# endif +_GL_CXXALIASWARN (gmtime); +# endif + /* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store the resulting broken-down time into TM. See . */ diff --git a/lib/unistd.c b/lib/unistd.c new file mode 100644 index 0000000..6c6a8e2 --- /dev/null +++ b/lib/unistd.c @@ -0,0 +1,3 @@ +#include +#define _GL_UNISTD_INLINE _GL_EXTERN_INLINE +#include "unistd.h" diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 9115486..622b228 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around . - Copyright (C) 2003-2012 Free Software Foundation, Inc. + Copyright (C) 2003-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,32 +14,30 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . */ +#ifndef _@GUARD_PREFIX@_UNISTD_H + #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ +#ifdef _GL_INCLUDING_UNISTD_H /* Special invocation convention: - - On mingw, several headers, including , include , - but we need to ensure that both the system and - are completely included before we replace gethostname. */ -#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \ - && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H -/* is being indirectly included for the first time from - ; avoid declaring any overrides. */ -# if @HAVE_UNISTD_H@ -# @INCLUDE_NEXT@ @NEXT_UNISTD_H@ -# else -# error unexpected; report this to bug-gnulib@gnu.org -# endif -# define _GL_WINSOCK2_H_WITNESS + - On Mac OS X 10.3.9 we have a sequence of nested includes + -> -> -> + In this situation, the functions are not yet declared, therefore we cannot + provide the C++ aliases. */ -/* Normal invocation. */ -#elif !defined _@GUARD_PREFIX@_UNISTD_H +#@INCLUDE_NEXT@ @NEXT_UNISTD_H@ + +#else +/* Normal invocation convention. */ /* The include_next requires a split double-inclusion guard. */ #if @HAVE_UNISTD_H@ +# define _GL_INCLUDING_UNISTD_H # @INCLUDE_NEXT@ @NEXT_UNISTD_H@ +# undef _GL_INCLUDING_UNISTD_H #endif /* Get all possible declarations of gethostname(). */ @@ -77,9 +75,13 @@ /* mingw, MSVC, BeOS, Haiku declare environ in , not in . */ /* Solaris declares getcwd not only in but also in . */ +/* OSF Tru64 Unix cannot see gnulib rpl_strtod when system is + included here. */ /* But avoid namespace pollution on glibc systems. */ -#ifndef __GLIBC__ +#if !defined __GLIBC__ && !defined __osf__ +# define __need_system_stdlib_h # include +# undef __need_system_stdlib_h #endif /* Native Windows platforms declare chdir, getcwd, rmdir in @@ -124,9 +126,18 @@ /* Get getopt(), optarg, optind, opterr, optopt. But avoid namespace pollution on glibc systems. */ #if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT +# define __need_getopt # include #endif +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_UNISTD_INLINE +# define _GL_UNISTD_INLINE _GL_INLINE +#endif + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ /* The definition of _GL_ARG_NONNULL is copied here. */ @@ -404,7 +415,7 @@ extern char **environ; # endif #elif defined GNULIB_POSIXCHECK # if HAVE_RAW_DECL_ENVIRON -static inline char *** +_GL_UNISTD_INLINE char *** rpl_environ (void) { return &environ; @@ -657,10 +668,19 @@ _GL_WARN_ON_USE (getdomainname, "getdomainname is unportable - " #if @GNULIB_GETDTABLESIZE@ /* Return the maximum number of file descriptors in the current process. In POSIX, this is same as sysconf (_SC_OPEN_MAX). */ -# if !@HAVE_GETDTABLESIZE@ +# if @REPLACE_GETDTABLESIZE@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getdtablesize +# define getdtablesize rpl_getdtablesize +# endif +_GL_FUNCDECL_RPL (getdtablesize, int, (void)); +_GL_CXXALIAS_RPL (getdtablesize, int, (void)); +# else +# if !@HAVE_GETDTABLESIZE@ _GL_FUNCDECL_SYS (getdtablesize, int, (void)); -# endif +# endif _GL_CXXALIAS_SYS (getdtablesize, int, (void)); +# endif _GL_CXXALIASWARN (getdtablesize); #elif defined GNULIB_POSIXCHECK # undef getdtablesize @@ -862,7 +882,7 @@ _GL_CXXALIAS_RPL (getpagesize, int, (void)); # define getpagesize() _gl_getpagesize () # else # if !GNULIB_defined_getpagesize_function -static inline int +_GL_UNISTD_INLINE int getpagesize () { return _gl_getpagesize (); @@ -1318,7 +1338,7 @@ _GL_WARN_ON_USE (rmdir, "rmdir is unportable - " _GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len) _GL_ARG_NONNULL ((1))); # endif -/* Need to cast, because on Solaris 11 2011-10, MacOS X 10.5, IRIX 6.5 +/* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5 and FreeBSD 6.4 the second parameter is int. On Solaris 11 2011-10, the first parameter is not const. */ _GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len)); @@ -1530,6 +1550,8 @@ _GL_CXXALIAS_SYS_CAST (write, ssize_t, (int fd, const void *buf, size_t count)); _GL_CXXALIASWARN (write); #endif +_GL_INLINE_HEADER_END #endif /* _@GUARD_PREFIX@_UNISTD_H */ +#endif /* _GL_INCLUDING_UNISTD_H */ #endif /* _@GUARD_PREFIX@_UNISTD_H */ diff --git a/lib/unistr.in.h b/lib/unistr.in.h index 5cda3f5..222c959 100644 --- a/lib/unistr.in.h +++ b/lib/unistr.in.h @@ -1,5 +1,5 @@ /* Elementary Unicode string functions. - Copyright (C) 2001-2002, 2005-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/lib/unistr/u8-mbtoucr.c b/lib/unistr/u8-mbtoucr.c index 8bc59d7..b11543a 100644 --- a/lib/unistr/u8-mbtoucr.c +++ b/lib/unistr/u8-mbtoucr.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-8 string, returning an error code. - Copyright (C) 1999-2002, 2006-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify it diff --git a/lib/unistr/u8-uctomb-aux.c b/lib/unistr/u8-uctomb-aux.c index 5ee212b..8fdd88b 100644 --- a/lib/unistr/u8-uctomb-aux.c +++ b/lib/unistr/u8-uctomb-aux.c @@ -1,5 +1,5 @@ /* Conversion UCS-4 to UTF-8. - Copyright (C) 2002, 2006-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it diff --git a/lib/unistr/u8-uctomb.c b/lib/unistr/u8-uctomb.c index e56e4a2..df9b227 100644 --- a/lib/unistr/u8-uctomb.c +++ b/lib/unistr/u8-uctomb.c @@ -1,5 +1,5 @@ /* Store a character in UTF-8 string. - Copyright (C) 2002, 2005-2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it diff --git a/lib/unitypes.in.h b/lib/unitypes.in.h index e642b7a..bc302c2 100644 --- a/lib/unitypes.in.h +++ b/lib/unitypes.in.h @@ -1,5 +1,5 @@ /* Elementary types and macros for the GNU UniString library. - Copyright (C) 2002, 2005-2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/lib/verify.h b/lib/verify.h index cef14ad..a25e514 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -1,6 +1,6 @@ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ /* Written by Paul Eggert, Bruno Haible, and Jim Meyering. */ #ifndef _GL_VERIFY_H -# define _GL_VERIFY_H +#define _GL_VERIFY_H /* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11. @@ -31,14 +31,24 @@ Use this only with GCC. If we were willing to slow 'configure' down we could also use it with other compilers, but since this affects only the quality of diagnostics, why bother? */ -# if (4 < __GNUC__ || (__GNUC__ == 4 && 6 <= __GNUC_MINOR__)) && !defined __cplusplus -# define _GL_HAVE__STATIC_ASSERT 1 -# endif +#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \ + && (201112L <= __STDC_VERSION__ || !defined __STRICT_ANSI__) \ + && !defined __cplusplus) +# define _GL_HAVE__STATIC_ASSERT 1 +#endif /* The condition (99 < __GNUC__) is temporary, until we know about the first G++ release that supports static_assert. */ -# if (99 < __GNUC__) && defined __cplusplus -# define _GL_HAVE_STATIC_ASSERT 1 -# endif +#if (99 < __GNUC__) && defined __cplusplus +# define _GL_HAVE_STATIC_ASSERT 1 +#endif + +/* FreeBSD 9.1 , included by and lots of other + system headers, defines a conflicting _Static_assert that is no + better than ours; override it. */ +#ifndef _GL_HAVE_STATIC_ASSERT +# include +# undef _Static_assert +#endif /* Each of these macros verifies that its argument R is nonzero. To be portable, R should be an integer constant expression. Unlike @@ -125,7 +135,7 @@ extern int (*dummy (void)) [sizeof (struct {...})]; * GCC warns about duplicate declarations of the dummy function if - -Wredundant_decls is used. GCC 4.3 and later have a builtin + -Wredundant-decls is used. GCC 4.3 and later have a builtin __COUNTER__ macro that can let us generate unique identifiers for each dummy function, to suppress this warning. @@ -133,54 +143,58 @@ which do not support _Static_assert, also do not warn about the last declaration mentioned above. + * GCC warns if -Wnested-externs is enabled and verify() is used + within a function body; but inside a function, you can always + arrange to use verify_expr() instead. + * In C++, any struct definition inside sizeof is invalid. Use a template type to work around the problem. */ /* Concatenate two preprocessor tokens. */ -# define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y) -# define _GL_CONCAT0(x, y) x##y +#define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y) +#define _GL_CONCAT0(x, y) x##y /* _GL_COUNTER is an integer, preferably one that changes each time we use it. Use __COUNTER__ if it works, falling back on __LINE__ otherwise. __LINE__ isn't perfect, but it's better than a constant. */ -# if defined __COUNTER__ && __COUNTER__ != __COUNTER__ -# define _GL_COUNTER __COUNTER__ -# else -# define _GL_COUNTER __LINE__ -# endif +#if defined __COUNTER__ && __COUNTER__ != __COUNTER__ +# define _GL_COUNTER __COUNTER__ +#else +# define _GL_COUNTER __LINE__ +#endif /* Generate a symbol with the given prefix, making it unique if possible. */ -# define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER) +#define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER) /* Verify requirement R at compile-time, as an integer constant expression that returns 1. If R is false, fail at compile-time, preferably with a diagnostic that includes the string-literal DIAGNOSTIC. */ -# define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \ - (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC))) +#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \ + (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC))) -# ifdef __cplusplus -# if !GNULIB_defined_struct__gl_verify_type +#ifdef __cplusplus +# if !GNULIB_defined_struct__gl_verify_type template struct _gl_verify_type { unsigned int _gl_verify_error_if_negative: w; }; -# define GNULIB_defined_struct__gl_verify_type 1 -# endif -# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ - _gl_verify_type<(R) ? 1 : -1> -# elif defined _GL_HAVE__STATIC_ASSERT -# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ - struct { \ - _Static_assert (R, DIAGNOSTIC); \ - int _gl_dummy; \ - } -# else -# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ - struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; } +# define GNULIB_defined_struct__gl_verify_type 1 # endif +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + _gl_verify_type<(R) ? 1 : -1> +#elif defined _GL_HAVE__STATIC_ASSERT +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + struct { \ + _Static_assert (R, DIAGNOSTIC); \ + int _gl_dummy; \ + } +#else +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; } +#endif /* Verify requirement R at compile-time, as a declaration without a trailing ';'. If R is false, fail at compile-time, preferably @@ -189,23 +203,23 @@ template Unfortunately, unlike C11, this implementation must appear as an ordinary declaration, and cannot appear inside struct { ... }. */ -# ifdef _GL_HAVE__STATIC_ASSERT -# define _GL_VERIFY _Static_assert -# else -# define _GL_VERIFY(R, DIAGNOSTIC) \ - extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ - [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] -# endif +#ifdef _GL_HAVE__STATIC_ASSERT +# define _GL_VERIFY _Static_assert +#else +# define _GL_VERIFY(R, DIAGNOSTIC) \ + extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ + [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] +#endif /* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */ -# ifdef _GL_STATIC_ASSERT_H -# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert -# define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC) -# endif -# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert -# define static_assert _Static_assert /* C11 requires this #define. */ -# endif +#ifdef _GL_STATIC_ASSERT_H +# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert +# define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC) # endif +# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert +# define static_assert _Static_assert /* C11 requires this #define. */ +# endif +#endif /* @assert.h omit start@ */ @@ -223,18 +237,42 @@ template verify_true is obsolescent; please use verify_expr instead. */ -# define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") +#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") /* Verify requirement R at compile-time. Return the value of the expression E. */ -# define verify_expr(R, E) \ - (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E)) +#define verify_expr(R, E) \ + (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E)) /* Verify requirement R at compile-time, as a declaration without a trailing ';'. */ -# define verify(R) _GL_VERIFY (R, "verify (" #R ")") +#define verify(R) _GL_VERIFY (R, "verify (" #R ")") + +#ifndef __has_builtin +# define __has_builtin(x) 0 +#endif + +/* Assume that R always holds. This lets the compiler optimize + accordingly. R should not have side-effects; it may or may not be + evaluated. Behavior is undefined if R is false. */ + +#if (__has_builtin (__builtin_unreachable) \ + || 4 < __GNUC__ + (5 <= __GNUC_MINOR__)) +# define assume(R) ((R) ? (void) 0 : __builtin_unreachable ()) +#elif 1200 <= _MSC_VER +# define assume(R) __assume (R) +#elif (defined lint \ + && (__has_builtin (__builtin_trap) \ + || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__)))) + /* Doing it this way helps various packages when configured with + --enable-gcc-warnings, which compiles with -Dlint. It's nicer + when 'assume' silences warnings even with older GCCs. */ +# define assume(R) ((R) ? (void) 0 : __builtin_trap ()) +#else +# define assume(R) ((void) (0 && (R))) +#endif /* @assert.h omit end@ */ diff --git a/lib/wchar.in.h b/lib/wchar.in.h index f9bc30c..473285f 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 , for platforms that have issues. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c index 9e6494e..1d340cd 100644 --- a/lib/wcrtomb.c +++ b/lib/wcrtomb.c @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/wcsdup-impl.h b/lib/wcsdup-impl.h index 0100ff5..b733a14 100644 --- a/lib/wcsdup-impl.h +++ b/lib/wcsdup-impl.h @@ -1,5 +1,5 @@ /* Duplicate a wide string. - Copyright (C) 1999, 2011-2012 Free Software Foundation, Inc. + Copyright (C) 1999, 2011-2014 Free Software Foundation, Inc. Written by Bruno Haible , 1999. This program is free software: you can redistribute it and/or modify diff --git a/lib/wcsdup.c b/lib/wcsdup.c index 2893b8f..a0f72a9 100644 --- a/lib/wcsdup.c +++ b/lib/wcsdup.c @@ -1,5 +1,5 @@ /* Duplicate a wide string. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/wctob.c b/lib/wctob.c index 0885c1b..d87d180 100644 --- a/lib/wctob.c +++ b/lib/wctob.c @@ -1,5 +1,5 @@ /* Convert wide character to unibyte character. - Copyright (C) 2008, 2010-2012 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/wctomb-impl.h b/lib/wctomb-impl.h index 68264cf..0fa170e 100644 --- a/lib/wctomb-impl.h +++ b/lib/wctomb-impl.h @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/wctomb.c b/lib/wctomb.c index 736a7c7..b3595a4 100644 --- a/lib/wctomb.c +++ b/lib/wctomb.c @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/wctype-h.c b/lib/wctype-h.c new file mode 100644 index 0000000..bb5f847 --- /dev/null +++ b/lib/wctype-h.c @@ -0,0 +1,4 @@ +/* Normally this would be wctype.c, but that name's already taken. */ +#include +#define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE +#include "wctype.h" diff --git a/lib/wctype.in.h b/lib/wctype.in.h index aa018b1..ab06653 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 , for platforms that lack it. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,6 +44,13 @@ # include #endif +/* mingw has declarations of towupper and towlower in as + well . Include in advance to avoid rpl_ prefix + being added to the declarations. */ +#ifdef __MINGW32__ +# include +#endif + /* Include the original if it exists. BeOS 5 has the functions but no . */ /* The include_next requires a split double-inclusion guard. */ @@ -54,6 +61,14 @@ #ifndef _@GUARD_PREFIX@_WCTYPE_H #define _@GUARD_PREFIX@_WCTYPE_H +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_WCTYPE_INLINE +# define _GL_WCTYPE_INLINE _GL_INLINE +#endif + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ /* The definition of _GL_WARN_ON_USE is copied here. */ @@ -148,7 +163,7 @@ typedef unsigned int rpl_wint_t; # endif # endif -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswalnum # else @@ -160,7 +175,7 @@ iswalnum || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')); } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswalpha # else @@ -171,7 +186,7 @@ iswalpha return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswblank # else @@ -182,7 +197,7 @@ iswblank return wc == ' ' || wc == '\t'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswcntrl # else @@ -193,7 +208,7 @@ iswcntrl return (wc & ~0x1f) == 0 || wc == 0x7f; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswdigit # else @@ -204,7 +219,7 @@ iswdigit return wc >= '0' && wc <= '9'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswgraph # else @@ -215,7 +230,7 @@ iswgraph return wc >= '!' && wc <= '~'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswlower # else @@ -226,7 +241,7 @@ iswlower return wc >= 'a' && wc <= 'z'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswprint # else @@ -237,7 +252,7 @@ iswprint return wc >= ' ' && wc <= '~'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswpunct # else @@ -250,7 +265,7 @@ iswpunct || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'))); } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswspace # else @@ -262,7 +277,7 @@ iswspace || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r'); } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswupper # else @@ -273,7 +288,7 @@ iswupper return wc >= 'A' && wc <= 'Z'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswxdigit # else @@ -285,7 +300,7 @@ iswxdigit || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F')); } -static inline wint_t +_GL_WCTYPE_INLINE wint_t # if @REPLACE_TOWLOWER@ rpl_towlower # else @@ -296,7 +311,7 @@ towlower return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc); } -static inline wint_t +_GL_WCTYPE_INLINE wint_t # if @REPLACE_TOWLOWER@ rpl_towupper # else @@ -336,7 +351,7 @@ _GL_FUNCDECL_SYS (iswblank, int, (wint_t wc)); result register. We need to fix this by adding a zero-extend from wchar_t to wint_t after the call. */ -static inline wint_t +_GL_WCTYPE_INLINE wint_t rpl_towlower (wint_t wc) { return (wint_t) (wchar_t) towlower (wc); @@ -345,7 +360,7 @@ rpl_towlower (wint_t wc) # define towlower rpl_towlower # endif -static inline wint_t +_GL_WCTYPE_INLINE wint_t rpl_towupper (wint_t wc) { return (wint_t) (wchar_t) towupper (wc); @@ -493,6 +508,7 @@ _GL_WARN_ON_USE (towctrans, "towctrans is unportable - " # endif #endif +_GL_INLINE_HEADER_END #endif /* _@GUARD_PREFIX@_WCTYPE_H */ #endif /* _@GUARD_PREFIX@_WCTYPE_H */ diff --git a/lib/wmemcpy-impl.h b/lib/wmemcpy-impl.h index 04a021d..06478e5 100644 --- a/lib/wmemcpy-impl.h +++ b/lib/wmemcpy-impl.h @@ -1,5 +1,5 @@ /* Copy wide character array. - Copyright (C) 1999, 2011-2012 Free Software Foundation, Inc. + Copyright (C) 1999, 2011-2014 Free Software Foundation, Inc. Written by Bruno Haible , 1999. This program is free software: you can redistribute it and/or modify diff --git a/lib/wmemcpy.c b/lib/wmemcpy.c index 4c6e6e2..78584ee 100644 --- a/lib/wmemcpy.c +++ b/lib/wmemcpy.c @@ -1,5 +1,5 @@ /* Copy wide character array. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 index d978cb8..8eca551 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -1,12 +1,28 @@ -# 00gnulib.m4 serial 2 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +# 00gnulib.m4 serial 3 +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl This file must be named something that sorts before all other dnl gnulib-provided .m4 files. It is needed until such time as we can -dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics. +dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and +dnl m4_divert semantics. + +# Until autoconf 2.63, handling of the diversion stack required m4_init +# to be called first; but this does not happen with aclocal. Wrapping +# the entire execution in another layer of the diversion stack fixes this. +# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4 +# for whether it was FIFO or LIFO; in order to properly balance with +# m4_init, we need to undo our push just before anything wrapped within +# the m4_init body. The way to ensure this is to wrap both sides of +# m4_init with a one-shot macro that does the pop at the right time. +m4_ifndef([_m4_divert_diversion], +[m4_divert_push([KILL]) +m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])]) +m4_define([m4_init], + [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])]) + # AC_DEFUN_ONCE([NAME], VALUE) # ---------------------------- diff --git a/m4/Makefile.in b/m4/Makefile.in index 6e8f466..481eadc 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,12 +17,12 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2012, John Zaitseff # +# Copyright (C) 1990-2014, John Zaitseff # # # ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 362 2012-03-14 15:36:23Z john $ +# $Id: Makefile.am 524 2014-05-23 21:31:22Z john $ # # This file, m4/Makefile.am, contains the m4 macro directory Makefile for # Star Traders. It needs to be processed by automake to produce the @@ -43,23 +42,51 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -78,18 +105,21 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = m4 -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/assert.m4 $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/assert.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ $(top_srcdir)/m4/ax_c___attribute__.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/ax_with_curses.m4 $(top_srcdir)/m4/btowc.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \ @@ -124,6 +154,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -131,10 +173,12 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ @@ -310,6 +354,7 @@ GNULIB_RENAMEAT = @GNULIB_RENAMEAT@ GNULIB_RMDIR = @GNULIB_RMDIR@ GNULIB_RPMATCH = @GNULIB_RPMATCH@ GNULIB_SCANF = @GNULIB_SCANF@ +GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ @@ -515,6 +560,7 @@ HAVE_READLINKAT = @HAVE_READLINKAT@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ +HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -699,11 +745,13 @@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ +REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ICONV = @REPLACE_ICONV@ REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@ REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@ @@ -714,6 +762,7 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ +REPLACE_LOCALTIME = @REPLACE_LOCALTIME@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ @@ -739,6 +788,7 @@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ +REPLACE_PTSNAME = @REPLACE_PTSNAME@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ @@ -798,6 +848,7 @@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -868,6 +919,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -881,6 +933,7 @@ EXTRA_DIST = \ ax_append_flag.m4 \ ax_cflags_warn_all.m4 \ ax_c___attribute__.m4 \ + ax_require_defined.m4 \ ax_with_curses.m4 \ gnulib-cache.m4 @@ -917,11 +970,11 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -1056,15 +1109,16 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4 new file mode 100644 index 0000000..ce3e39e --- /dev/null +++ b/m4/absolute-header.m4 @@ -0,0 +1,102 @@ +# absolute-header.m4 serial 16 +dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Derek Price. + +# gl_ABSOLUTE_HEADER(HEADER1 HEADER2 ...) +# --------------------------------------- +# Find the absolute name of a header file, testing first if the header exists. +# If the header were sys/inttypes.h, this macro would define +# ABSOLUTE_SYS_INTTYPES_H to the '""' quoted absolute name of sys/inttypes.h +# in config.h +# (e.g. '#define ABSOLUTE_SYS_INTTYPES_H "///usr/include/sys/inttypes.h"'). +# The three "///" are to pacify Sun C 5.8, which otherwise would say +# "warning: #include of /usr/include/... may be non-portable". +# Use '""', not '<>', so that the /// cannot be confused with a C99 comment. +# Note: This macro assumes that the header file is not empty after +# preprocessing, i.e. it does not only define preprocessor macros but also +# provides some type/enum definitions or function/variable declarations. +AC_DEFUN([gl_ABSOLUTE_HEADER], +[AC_REQUIRE([AC_CANONICAL_HOST]) +AC_LANG_PREPROC_REQUIRE()dnl +dnl FIXME: gl_absolute_header and ac_header_exists must be used unquoted +dnl until we can assume autoconf 2.64 or newer. +m4_foreach_w([gl_HEADER_NAME], [$1], + [AS_VAR_PUSHDEF([gl_absolute_header], + [gl_cv_absolute_]m4_defn([gl_HEADER_NAME]))dnl + AC_CACHE_CHECK([absolute name of <]m4_defn([gl_HEADER_NAME])[>], + m4_defn([gl_absolute_header]), + [AS_VAR_PUSHDEF([ac_header_exists], + [ac_cv_header_]m4_defn([gl_HEADER_NAME]))dnl + AC_CHECK_HEADERS_ONCE(m4_defn([gl_HEADER_NAME]))dnl + if test AS_VAR_GET(ac_header_exists) = yes; then + gl_ABSOLUTE_HEADER_ONE(m4_defn([gl_HEADER_NAME])) + fi + AS_VAR_POPDEF([ac_header_exists])dnl + ])dnl + AC_DEFINE_UNQUOTED(AS_TR_CPP([ABSOLUTE_]m4_defn([gl_HEADER_NAME])), + ["AS_VAR_GET(gl_absolute_header)"], + [Define this to an absolute name of <]m4_defn([gl_HEADER_NAME])[>.]) + AS_VAR_POPDEF([gl_absolute_header])dnl +])dnl +])# gl_ABSOLUTE_HEADER + +# gl_ABSOLUTE_HEADER_ONE(HEADER) +# ------------------------------ +# Like gl_ABSOLUTE_HEADER, except that: +# - it assumes that the header exists, +# - it uses the current CPPFLAGS, +# - it does not cache the result, +# - it is silent. +AC_DEFUN([gl_ABSOLUTE_HEADER_ONE], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote([$1])[[>]])]) + dnl AIX "xlc -E" and "cc -E" omit #line directives for header files + dnl that contain only a #include of other header files and no + dnl non-comment tokens of their own. This leads to a failure to + dnl detect the absolute name of , , + dnl and others. The workaround is to force preservation of comments + dnl through option -C. This ensures all necessary #line directives + dnl are present. GCC supports option -C as well. + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac +changequote(,) + case "$host_os" in + mingw*) + dnl For the sake of native Windows compilers (excluding gcc), + dnl treat backslash as a directory separator, like /. + dnl Actually, these compilers use a double-backslash as + dnl directory separator, inside the + dnl # line "filename" + dnl directives. + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + dnl A sed expression that turns a string into a basic regular + dnl expression, for use within "/.../". + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo '$1' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' +changequote([,]) + dnl eval is necessary to expand gl_absname_cpp. + dnl Ultrix and Pyramid sh refuse to redirect output of eval, + dnl so use subshell. + AS_VAR_SET([gl_cv_absolute_]AS_TR_SH([[$1]]), +[`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | + sed -n "$gl_absolute_header_sed"`]) +]) diff --git a/m4/assert.m4 b/m4/assert.m4 index b748e5e..b9bb634 100644 --- a/m4/assert.m4 +++ b/m4/assert.m4 @@ -1,6 +1,6 @@ #serial 7 -# Copyright (C) 1998-1999, 2001, 2004, 2008-2012 Free Software Foundation, Inc. +# Copyright (C) 1998-1999, 2001, 2004, 2008-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/btowc.m4 b/m4/btowc.m4 index e565321..9988944 100644 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,5 +1,5 @@ # btowc.m4 serial 10 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/codeset.m4 b/m4/codeset.m4 index cf53d24..d7de8d6 100644 --- a/m4/codeset.m4 +++ b/m4/codeset.m4 @@ -1,5 +1,5 @@ # codeset.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2006, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/config-h.m4 b/m4/config-h.m4 index b61e22f..5262996 100644 --- a/m4/config-h.m4 +++ b/m4/config-h.m4 @@ -1,6 +1,6 @@ # Say that -DHAVE_CONFIG_H is not needed. -dnl Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/configmake.m4 b/m4/configmake.m4 index 8c82371..0cd86cf 100644 --- a/m4/configmake.m4 +++ b/m4/configmake.m4 @@ -1,5 +1,5 @@ -# configmake.m4 serial 1 -dnl Copyright (C) 2010-2012 Free Software Foundation, Inc. +# configmake.m4 serial 2 +dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,8 +7,9 @@ dnl with or without modifications, as long as this notice is preserved. # gl_CONFIGMAKE_PREP # ------------------ # Guarantee all of the standard directory variables, even when used with -# autoconf 2.59 (datarootdir wasn't supported until 2.59c) or automake -# 1.9.6 (pkglibexecdir wasn't supported until 1.10b.). +# autoconf 2.59 (datarootdir wasn't supported until 2.59c, and runstatedir +# in 2.70) or automake 1.9.6 (pkglibexecdir wasn't supported until 1.10b, +# and runstatedir in 1.14.1). AC_DEFUN([gl_CONFIGMAKE_PREP], [ dnl Technically, datadir should default to datarootdir. But if @@ -43,6 +44,10 @@ AC_DEFUN([gl_CONFIGMAKE_PREP], if test "x$localedir" = x; then AC_SUBST([localedir], ['${datarootdir}/locale']) fi + dnl Added in autoconf 2.70 + if test "x$runstatedir" = x; then + AC_SUBST([runstatedir], ['${localstatedir}/run']) + fi dnl Automake 1.9.6 only lacks pkglibexecdir; and since 1.11 merely dnl provides it without AC_SUBST, this blind use of AC_SUBST is safe. diff --git a/m4/extensions.m4 b/m4/extensions.m4 index 0bfaef6..37f55ca 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,14 +1,14 @@ -# serial 11 -*- Autoconf -*- +# serial 13 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS +# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from git # Autoconf. Perhaps we can remove this once we can assume Autoconf -# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly +# 2.70 or later everywhere, but since Autoconf mutates rapidly # enough in this area it's likely we'll need to redefine # AC_USE_SYSTEM_EXTENSIONS for quite some time. @@ -30,6 +30,7 @@ # ------------------------ # Enable extensions on systems that normally disable them, # typically due to standards-conformance issues. +# # Remember that #undef in AH_VERBATIM gets replaced with #define by # AC_DEFINE. The goal here is to define all known feature-enabling # macros, then, if reports of conflicts are made, disable macros that @@ -38,8 +39,6 @@ AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS], [AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl AC_BEFORE([$0], [AC_RUN_IFELSE])dnl - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=]) if test "$MINIX" = yes; then AC_DEFINE([_POSIX_SOURCE], [1], @@ -50,24 +49,18 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl except with this defined.]) AC_DEFINE([_MINIX], [1], [Define to 1 if on MINIX.]) + AC_DEFINE([_NETBSD_SOURCE], [1], + [Define to 1 to make NetBSD features available. MINIX 3 needs this.]) fi - dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500, - dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already - dnl provided. - case "$host_os" in - hpux*) - AC_DEFINE([_XOPEN_SOURCE], [500], - [Define to 500 only on HP-UX.]) - ;; - esac - - AH_VERBATIM([__EXTENSIONS__], +dnl Use a different key than __EXTENSIONS__, as that name broke existing +dnl configure.ac when using autoheader 2.62. + AH_VERBATIM([USE_SYSTEM_EXTENSIONS], [/* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif -/* Enable general extensions on MacOS X. */ +/* Enable general extensions on OS X. */ #ifndef _DARWIN_C_SOURCE # undef _DARWIN_C_SOURCE #endif @@ -83,6 +76,12 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl #ifndef _TANDEM_SOURCE # undef _TANDEM_SOURCE #endif +/* Enable X/Open extensions if necessary. HP-UX 11.11 defines + mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of + whether compiling with -Ae or -D_HPUX_SOURCE=1. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif /* Enable general extensions on Solaris. */ #ifndef __EXTENSIONS__ # undef __EXTENSIONS__ @@ -103,6 +102,22 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl AC_DEFINE([_GNU_SOURCE]) AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) AC_DEFINE([_TANDEM_SOURCE]) + AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined], + [ac_cv_should_define__xopen_source], + [ac_cv_should_define__xopen_source=no + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #include + mbstate_t x;]])], + [], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #define _XOPEN_SOURCE 500 + #include + mbstate_t x;]])], + [ac_cv_should_define__xopen_source=yes])])]) + test $ac_cv_should_define__xopen_source = yes && + AC_DEFINE([_XOPEN_SOURCE], [500]) ])# AC_USE_SYSTEM_EXTENSIONS # gl_USE_SYSTEM_EXTENSIONS diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 new file mode 100644 index 0000000..240150e --- /dev/null +++ b/m4/extern-inline.m4 @@ -0,0 +1,84 @@ +dnl 'extern inline' a la ISO C99. + +dnl Copyright 2012-2014 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_EXTERN_INLINE], +[ + AH_VERBATIM([extern_inline], +[/* Please see the Gnulib manual for how to use these macros. + + Suppress extern inline with HP-UX cc, as it appears to be broken; see + . + + Suppress extern inline with Sun C in standards-conformance mode, as it + mishandles inline functions that call each other. E.g., for 'inline void f + (void) { } inline void g (void) { f (); }', c99 incorrectly complains + 'reference to static identifier "f" in extern inline function'. + This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. + + Suppress the use of extern inline on problematic Apple configurations. + OS X 10.8 and earlier mishandle it; see, e.g., + . + OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and + for clang but remains for g++; see . + Perhaps Apple will fix this some day. */ +#if (defined __APPLE__ \ + && (defined __header_inline \ + ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ + && ! defined __clang__) \ + : ((! defined _DONT_USE_CTYPE_INLINE_ \ + && (defined __GNUC__ || defined __cplusplus)) \ + || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ + && defined __GNUC__ && ! defined __cplusplus)))) +# define _GL_EXTERN_INLINE_APPLE_BUG +#endif +#if ((__GNUC__ \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ + : (199901L <= __STDC_VERSION__ \ + && !defined __HP_cc \ + && !(defined __SUNPRO_C && __STDC__))) \ + && !defined _GL_EXTERN_INLINE_APPLE_BUG) +# define _GL_INLINE inline +# define _GL_EXTERN_INLINE extern inline +# define _GL_EXTERN_INLINE_IN_USE +#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ + && !defined _GL_EXTERN_INLINE_APPLE_BUG) +# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ + /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ +# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) +# else +# define _GL_INLINE extern inline +# endif +# define _GL_EXTERN_INLINE extern +# define _GL_EXTERN_INLINE_IN_USE +#else +# define _GL_INLINE static _GL_UNUSED +# define _GL_EXTERN_INLINE static _GL_UNUSED +#endif + +#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ +# define _GL_INLINE_HEADER_CONST_PRAGMA +# else +# define _GL_INLINE_HEADER_CONST_PRAGMA \ + _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") +# endif + /* Suppress GCC's bogus "no previous prototype for 'FOO'" + and "no previous declaration for 'FOO'" diagnostics, + when FOO is an inline function in the header; see + . */ +# define _GL_INLINE_HEADER_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \ + _GL_INLINE_HEADER_CONST_PRAGMA +# define _GL_INLINE_HEADER_END \ + _Pragma ("GCC diagnostic pop") +#else +# define _GL_INLINE_HEADER_BEGIN +# define _GL_INLINE_HEADER_END +#endif]) +]) diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4 index 9862741..43c9312 100644 --- a/m4/fcntl-o.m4 +++ b/m4/fcntl-o.m4 @@ -1,5 +1,5 @@ # fcntl-o.m4 serial 4 -dnl Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -50,7 +50,18 @@ AC_DEFUN([gl_FCNTL_O_FLAGS], #if HAVE_SYMLINK { static char const sym[] = "conftest.sym"; - if (symlink (".", sym) != 0) + if (symlink ("/dev/null", sym) != 0) + result |= 2; + else + { + int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0); + if (fd >= 0) + { + close (fd); + result |= 4; + } + } + if (unlink (sym) != 0 || symlink (".", sym) != 0) result |= 2; else { diff --git a/m4/getopt.m4 b/m4/getopt.m4 index 2aea895..f127028 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ -# getopt.m4 serial 39 -dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc. +# getopt.m4 serial 44 +dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,18 +9,17 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX], [ m4_divert_text([DEFAULTS], [gl_getopt_required=POSIX]) AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + AC_REQUIRE([gl_GETOPT_CHECK_HEADERS]) dnl Other modules can request the gnulib implementation of the getopt dnl functions unconditionally, by defining gl_REPLACE_GETOPT_ALWAYS. dnl argp.m4 does this. m4_ifdef([gl_REPLACE_GETOPT_ALWAYS], [ - gl_GETOPT_IFELSE([], []) REPLACE_GETOPT=1 ], [ REPLACE_GETOPT=0 - gl_GETOPT_IFELSE([ + if test -n "$gl_replace_getopt"; then REPLACE_GETOPT=1 - ], - []) + fi ]) if test $REPLACE_GETOPT = 1; then dnl Arrange for getopt.h to be created. @@ -38,13 +37,6 @@ AC_DEFUN([gl_FUNC_GETOPT_GNU], AC_REQUIRE([gl_FUNC_GETOPT_POSIX]) ]) -# emacs' configure.in uses this. -AC_DEFUN([gl_GETOPT_IFELSE], -[ - AC_REQUIRE([gl_GETOPT_CHECK_HEADERS]) - AS_IF([test -n "$gl_replace_getopt"], [$1], [$2]) -]) - # Determine whether to replace the entire getopt facility. AC_DEFUN([gl_GETOPT_CHECK_HEADERS], [ @@ -74,11 +66,6 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS], AC_CHECK_FUNCS([getopt_long_only], [], [gl_replace_getopt=yes]) fi - dnl mingw's getopt (in libmingwex.a) does weird things when the options - dnl strings starts with '+' and it's not the first call. Some internal state - dnl is left over from earlier calls, and neither setting optind = 0 nor - dnl setting optreset = 1 get rid of this internal state. - dnl POSIX is silent on optind vs. optreset, so we allow either behavior. dnl POSIX 2008 does not specify leading '+' behavior, but see dnl http://austingroupbugs.net/view.php?id=191 for a recommendation on dnl the next version of POSIX. For now, we only guarantee leading '+' @@ -87,30 +74,16 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS], AC_CACHE_CHECK([whether getopt is POSIX compatible], [gl_cv_func_getopt_posix], [ - dnl BSD getopt_long uses an incompatible method to reset option - dnl processing. Existence of the optreset variable, in and of - dnl itself, is not a reason to replace getopt, but knowledge - dnl of the variable is needed to determine how to reset and - dnl whether a reset reparses the environment. Solaris - dnl supports neither optreset nor optind=0, but keeps no state - dnl that needs a reset beyond setting optind=1; detect Solaris - dnl by getopt_clip. - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[int *p = &optreset; return optreset;]])], - [gl_optind_min=1], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[return !getopt_clip;]])], - [gl_optind_min=1], - [gl_optind_min=0])]) - - dnl This test fails on mingw and succeeds on many other platforms. - gl_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -DOPTIND_MIN=$gl_optind_min" - AC_RUN_IFELSE([AC_LANG_SOURCE([[ + dnl Merging these three different test programs into a single one + dnl would require a reset mechanism. On BSD systems, it can be done + dnl through 'optreset'; on some others (glibc), it can be done by + dnl setting 'optind' to 0; on others again (HP-UX, IRIX, OSF/1, + dnl Solaris 9, musl libc), there is no such mechanism. + if test $cross_compiling = no; then + dnl Sanity check. Succeeds everywhere (except on MSVC, + dnl which lacks and getopt() entirely). + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ #include #include #include @@ -118,89 +91,107 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS], int main () { - { - static char program[] = "program"; - static char a[] = "-a"; - static char foo[] = "foo"; - static char bar[] = "bar"; - char *argv[] = { program, a, foo, bar, NULL }; - int c; - - optind = OPTIND_MIN; - opterr = 0; - - c = getopt (4, argv, "ab"); - if (!(c == 'a')) - return 1; - c = getopt (4, argv, "ab"); - if (!(c == -1)) - return 2; - if (!(optind == 2)) - return 3; - } - /* Some internal state exists at this point. */ - { - static char program[] = "program"; - static char donald[] = "donald"; - static char p[] = "-p"; - static char billy[] = "billy"; - static char duck[] = "duck"; - static char a[] = "-a"; - static char bar[] = "bar"; - char *argv[] = { program, donald, p, billy, duck, a, bar, NULL }; - int c; - - optind = OPTIND_MIN; - opterr = 0; - - c = getopt (7, argv, "+abp:q:"); - if (!(c == -1)) - return 4; - if (!(strcmp (argv[0], "program") == 0)) - return 5; - if (!(strcmp (argv[1], "donald") == 0)) - return 6; - if (!(strcmp (argv[2], "-p") == 0)) - return 7; - if (!(strcmp (argv[3], "billy") == 0)) - return 8; - if (!(strcmp (argv[4], "duck") == 0)) - return 9; - if (!(strcmp (argv[5], "-a") == 0)) - return 10; - if (!(strcmp (argv[6], "bar") == 0)) - return 11; - if (!(optind == 1)) - return 12; - } - /* Detect MacOS 10.5, AIX 7.1 bug. */ - { - static char program[] = "program"; - static char ab[] = "-ab"; - char *argv[3] = { program, ab, NULL }; - optind = OPTIND_MIN; - opterr = 0; - if (getopt (2, argv, "ab:") != 'a') - return 13; - if (getopt (2, argv, "ab:") != '?') - return 14; - if (optopt != 'b') - return 15; - if (optind != 2) - return 16; - } + static char program[] = "program"; + static char a[] = "-a"; + static char foo[] = "foo"; + static char bar[] = "bar"; + char *argv[] = { program, a, foo, bar, NULL }; + int c; + c = getopt (4, argv, "ab"); + if (!(c == 'a')) + return 1; + c = getopt (4, argv, "ab"); + if (!(c == -1)) + return 2; + if (!(optind == 2)) + return 3; return 0; } ]])], - [gl_cv_func_getopt_posix=yes], [gl_cv_func_getopt_posix=no], - [case "$host_os" in - mingw*) gl_cv_func_getopt_posix="guessing no";; - darwin* | aix*) gl_cv_func_getopt_posix="guessing no";; - *) gl_cv_func_getopt_posix="guessing yes";; - esac - ]) - CPPFLAGS=$gl_save_CPPFLAGS + [gl_cv_func_getopt_posix=maybe], + [gl_cv_func_getopt_posix=no]) + if test $gl_cv_func_getopt_posix = maybe; then + dnl Sanity check with '+'. Succeeds everywhere (except on MSVC, + dnl which lacks and getopt() entirely). + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include +#include +#include + +int +main () +{ + static char program[] = "program"; + static char donald[] = "donald"; + static char p[] = "-p"; + static char billy[] = "billy"; + static char duck[] = "duck"; + static char a[] = "-a"; + static char bar[] = "bar"; + char *argv[] = { program, donald, p, billy, duck, a, bar, NULL }; + int c; + + c = getopt (7, argv, "+abp:q:"); + if (!(c == -1)) + return 4; + if (!(strcmp (argv[0], "program") == 0)) + return 5; + if (!(strcmp (argv[1], "donald") == 0)) + return 6; + if (!(strcmp (argv[2], "-p") == 0)) + return 7; + if (!(strcmp (argv[3], "billy") == 0)) + return 8; + if (!(strcmp (argv[4], "duck") == 0)) + return 9; + if (!(strcmp (argv[5], "-a") == 0)) + return 10; + if (!(strcmp (argv[6], "bar") == 0)) + return 11; + if (!(optind == 1)) + return 12; + return 0; +} +]])], + [gl_cv_func_getopt_posix=maybe], + [gl_cv_func_getopt_posix=no]) + fi + if test $gl_cv_func_getopt_posix = maybe; then + dnl Detect Mac OS X 10.5, AIX 7.1, mingw bug. + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include +#include +#include + +int +main () +{ + static char program[] = "program"; + static char ab[] = "-ab"; + char *argv[3] = { program, ab, NULL }; + if (getopt (2, argv, "ab:") != 'a') + return 13; + if (getopt (2, argv, "ab:") != '?') + return 14; + if (optopt != 'b') + return 15; + if (optind != 2) + return 16; + return 0; +} +]])], + [gl_cv_func_getopt_posix=yes], + [gl_cv_func_getopt_posix=no]) + fi + else + case "$host_os" in + darwin* | aix* | mingw*) gl_cv_func_getopt_posix="guessing no";; + *) gl_cv_func_getopt_posix="guessing yes";; + esac + fi ]) case "$gl_cv_func_getopt_posix" in *no) gl_replace_getopt=yes ;; @@ -236,7 +227,7 @@ dnl is ambiguous with environment values that contain newlines. nocrash_init(); /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw, - and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, + and fails on Mac OS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10. */ { static char conftest[] = "conftest"; @@ -247,7 +238,7 @@ dnl is ambiguous with environment values that contain newlines. result |= 1; } /* This code succeeds on glibc 2.8, mingw, - and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11, + and fails on Mac OS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x. */ { static char program[] = "program"; @@ -276,7 +267,7 @@ dnl is ambiguous with environment values that contain newlines. if (getopt (3, argv, "-p") != 1) result |= 16; else if (getopt (3, argv, "-p") != 'p') - result |= 32; + result |= 16; } /* This code fails on glibc 2.11. */ { @@ -286,9 +277,9 @@ dnl is ambiguous with environment values that contain newlines. char *argv[] = { program, b, a, NULL }; optind = opterr = 0; if (getopt (3, argv, "+:a:b") != 'b') - result |= 64; + result |= 32; else if (getopt (3, argv, "+:a:b") != ':') - result |= 64; + result |= 32; } /* This code dumps core on glibc 2.14. */ { @@ -298,18 +289,14 @@ dnl is ambiguous with environment values that contain newlines. char *argv[] = { program, w, dummy, NULL }; optind = opterr = 1; if (getopt (3, argv, "W;") != 'W') - result |= 128; + result |= 64; } return result; ]])], [gl_cv_func_getopt_gnu=yes], [gl_cv_func_getopt_gnu=no], - [dnl Cross compiling. Guess based on host and declarations. - case $host_os:$ac_cv_have_decl_optreset in - *-gnu*:* | mingw*:*) gl_cv_func_getopt_gnu=no;; - *:yes) gl_cv_func_getopt_gnu=no;; - *) gl_cv_func_getopt_gnu=yes;; - esac + [dnl Cross compiling. Assume the worst, even on glibc platforms. + gl_cv_func_getopt_gnu="guessing no" ]) case $gl_had_POSIXLY_CORRECT in exported) ;; @@ -317,13 +304,54 @@ dnl is ambiguous with environment values that contain newlines. *) AS_UNSET([POSIXLY_CORRECT]) ;; esac ]) - if test "$gl_cv_func_getopt_gnu" = "no"; then + if test "$gl_cv_func_getopt_gnu" != yes; then gl_replace_getopt=yes + else + AC_CACHE_CHECK([for working GNU getopt_long function], + [gl_cv_func_getopt_long_gnu], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + #include + ]], + [[static const struct option long_options[] = + { + { "xtremely-",no_argument, NULL, 1003 }, + { "xtra", no_argument, NULL, 1001 }, + { "xtreme", no_argument, NULL, 1002 }, + { "xtremely", no_argument, NULL, 1003 }, + { NULL, 0, NULL, 0 } + }; + /* This code fails on OpenBSD 5.0. */ + { + static char program[] = "program"; + static char xtremel[] = "--xtremel"; + char *argv[] = { program, xtremel, NULL }; + int option_index; + optind = 1; opterr = 0; + if (getopt_long (2, argv, "", long_options, &option_index) != 1003) + return 1; + } + return 0; + ]])], + [gl_cv_func_getopt_long_gnu=yes], + [gl_cv_func_getopt_long_gnu=no], + [dnl Cross compiling. Guess no on OpenBSD, yes otherwise. + case "$host_os" in + openbsd*) gl_cv_func_getopt_long_gnu="guessing no";; + *) gl_cv_func_getopt_long_gnu="guessing yes";; + esac + ]) + ]) + case "$gl_cv_func_getopt_long_gnu" in + *yes) ;; + *) gl_replace_getopt=yes ;; + esac fi fi ]) -# emacs' configure.in uses this. AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], [ GETOPT_H=getopt.h @@ -334,7 +362,6 @@ AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], ]) # Prerequisites of lib/getopt*. -# emacs' configure.in uses this. AC_DEFUN([gl_PREREQ_GETOPT], [ AC_CHECK_DECLS_ONCE([getenv]) diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 5415f88..be247bf 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 64 (gettext-0.18.2) -dnl Copyright (C) 1995-2012 Free Software Foundation, Inc. +# gettext.m4 serial 66 (gettext-0.18.2) +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -97,7 +97,7 @@ AC_DEFUN([AM_GNU_GETTEXT], AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) - dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. + dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. gt_INTL_MACOSX dnl Set USE_NLS. diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index eda9702..1c2d66e 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,6 +1,6 @@ -# serial 20 +# serial 21 -# Copyright (C) 2001-2003, 2005, 2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005, 2007, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -127,10 +127,8 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], ]) AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [ - AC_DEFINE([gmtime], [rpl_gmtime], - [Define to rpl_gmtime if the replacement function should be used.]) - AC_DEFINE([localtime], [rpl_localtime], - [Define to rpl_localtime if the replacement function should be used.]) + REPLACE_GMTIME=1 + REPLACE_LOCALTIME=1 ]) # Prerequisites of lib/gettimeofday.c. diff --git a/m4/glibc2.m4 b/m4/glibc2.m4 index f4c4ad1..71dd8a1 100644 --- a/m4/glibc2.m4 +++ b/m4/glibc2.m4 @@ -1,5 +1,5 @@ # glibc2.m4 serial 3 -dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2012 Free Software Foundation, +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 index c938fb1..ab58b71 100644 --- a/m4/glibc21.m4 +++ b/m4/glibc21.m4 @@ -1,5 +1,5 @@ # glibc21.m4 serial 5 -dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2012 Free Software Foundation, +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index ab3c43d..20ce40e 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ -# gnulib-common.m4 serial 32 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +# gnulib-common.m4 serial 34 +dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -14,7 +14,8 @@ AC_DEFUN([gl_COMMON], [ AC_DEFUN([gl_COMMON_BODY], [ AH_VERBATIM([_Noreturn], [/* The _Noreturn keyword of C11. */ -#if !defined _Noreturn && __STDC_VERSION__ < 201112 +#if ! (defined _Noreturn \ + || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ || 0x5110 <= __SUNPRO_C) # define _Noreturn __attribute__ ((__noreturn__)) @@ -29,7 +30,7 @@ AC_DEFUN([gl_COMMON_BODY], [ [/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. - __APPLE__ && __MACH__ test for MacOS X. + __APPLE__ && __MACH__ test for Mac OS X. __APPLE_CC__ tests for the Apple compiler and its version. __STDC_VERSION__ tests for the C99 mode. */ #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ @@ -293,6 +294,8 @@ Amsterdam # for interoperability with automake-1.9.6 from autoconf-2.62. # Remove this macro when we can assume autoconf >= 2.62 or # autoconf >= 2.60 && automake >= 1.10. +# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. +m4_ifndef([AC_AUTOCONF_VERSION],[ m4_ifdef([AC_PROG_MKDIR_P], [ dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed. m4_define([AC_PROG_MKDIR_P], @@ -303,13 +306,15 @@ m4_ifdef([AC_PROG_MKDIR_P], [ [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake MKDIR_P='$(mkdir_p)' AC_SUBST([MKDIR_P])])]) +]) # AC_C_RESTRICT # This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61, # so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++ # works. # This definition can be removed once autoconf >= 2.62 can be assumed. -m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[ +# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. +m4_ifndef([AC_AUTOCONF_VERSION],[ AC_DEFUN([AC_C_RESTRICT], [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], [ac_cv_c_restrict=no @@ -370,3 +375,63 @@ AC_DEFUN([gl_CACHE_VAL_SILENT], AC_CACHE_VAL([$1], [$2]) as_echo_n="$saved_as_echo_n" ]) + +# AS_VAR_COPY was added in autoconf 2.63b +m4_define_default([AS_VAR_COPY], +[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])]) + +# AC_PROG_SED was added in autoconf 2.59b +m4_ifndef([AC_PROG_SED], +[AC_DEFUN([AC_PROG_SED], +[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED, + [dnl ac_script should not contain more than 99 commands (for HP-UX sed), + dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed. + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + AS_UNSET([ac_script]) + if test -z "$SED"; then + ac_path_SED_found=false + _AS_PATH_WALK([], [ + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + AS_EXECUTABLE_P(["$ac_path_SED"]) || continue + case `"$ac_path_SED" --version 2>&1` in + *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;; + *) + ac_count=0 + _AS_ECHO_N([0123456789]) >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >> conftest.nl + "$ac_path_SED" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best so far, but keep looking for better + ac_cv_path_SED=$ac_path_SED + ac_path_SED_max=$ac_count + fi + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + $ac_path_SED_found && break 3 + done + done]) + if test -z "$ac_cv_path_SED"; then + AC_ERROR([no acceptable sed could be found in \$PATH]) + fi + else + ac_cv_path_SED=$SED + fi + SED="$ac_cv_path_SED" + AC_SUBST([SED])dnl + rm -f conftest.sed +])])]) diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index b561140..7fd8195 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -1,5 +1,5 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 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 @@ -39,14 +39,17 @@ AC_DEFUN([gl_EARLY], m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable 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 c-ctype: # Code from module c-strcase: # Code from module config-h: # Code from module configmake: + # Code from module crc: # Code from module extensions: AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + # Code from module extern-inline: # Code from module getopt-gnu: # Code from module getopt-posix: # Code from module gettext: @@ -120,157 +123,158 @@ AC_DEFUN([gl_INIT], 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 -gl_CONFIGMAKE_PREP -gl_FUNC_GETOPT_GNU -if test $REPLACE_GETOPT = 1; then - AC_LIBOBJ([getopt]) - AC_LIBOBJ([getopt1]) - gl_PREREQ_GETOPT - dnl Arrange for unistd.h to include getopt.h. - GNULIB_GL_UNISTD_H_GETOPT=1 -fi -AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) -gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu]) -gl_FUNC_GETOPT_POSIX -if test $REPLACE_GETOPT = 1; then - AC_LIBOBJ([getopt]) - AC_LIBOBJ([getopt1]) - gl_PREREQ_GETOPT - dnl Arrange for unistd.h to include getopt.h. - GNULIB_GL_UNISTD_H_GETOPT=1 -fi -AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) -dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac. -AM_GNU_GETTEXT_VERSION([0.18.1]) -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_LOCALCHARSET -LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" -AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) -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_MBSINIT -if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then - AC_LIBOBJ([mbsinit]) - gl_PREREQ_MBSINIT -fi -gl_WCHAR_MODULE_INDICATOR([mbsinit]) -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_FUNC_MBTOWC -if test $REPLACE_MBTOWC = 1; then - AC_LIBOBJ([mbtowc]) - gl_PREREQ_MBTOWC -fi -gl_STDLIB_MODULE_INDICATOR([mbtowc]) -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_MULTIARCH -gt_TYPE_SSIZE_T -AM_STDBOOL_H -gl_STDDEF_H -gl_STDINT_H -gl_STDIO_H -gl_STDLIB_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.2], [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], [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_FUNC_WCTOMB -if test $REPLACE_WCTOMB = 1; then - AC_LIBOBJ([wctomb]) - gl_PREREQ_WCTOMB -fi -gl_STDLIB_MODULE_INDICATOR([wctomb]) -gl_WCTYPE_H -gl_FUNC_WMEMCPY -if test $HAVE_WMEMCPY = 0; then - AC_LIBOBJ([wmemcpy]) -fi -gl_WCHAR_MODULE_INDICATOR([wmemcpy]) + 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 + gl_CONFIGMAKE_PREP + AC_REQUIRE([gl_EXTERN_INLINE]) + gl_FUNC_GETOPT_GNU + if test $REPLACE_GETOPT = 1; then + AC_LIBOBJ([getopt]) + AC_LIBOBJ([getopt1]) + gl_PREREQ_GETOPT + dnl Arrange for unistd.h to include getopt.h. + GNULIB_GL_UNISTD_H_GETOPT=1 + fi + AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) + gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu]) + gl_FUNC_GETOPT_POSIX + if test $REPLACE_GETOPT = 1; then + AC_LIBOBJ([getopt]) + AC_LIBOBJ([getopt1]) + gl_PREREQ_GETOPT + dnl Arrange for unistd.h to include getopt.h. + GNULIB_GL_UNISTD_H_GETOPT=1 + fi + AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) + dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac. + AM_GNU_GETTEXT_VERSION([0.18.1]) + 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_LOCALCHARSET + LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" + AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) + 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_MBSINIT + if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then + AC_LIBOBJ([mbsinit]) + gl_PREREQ_MBSINIT + fi + gl_WCHAR_MODULE_INDICATOR([mbsinit]) + 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_FUNC_MBTOWC + if test $REPLACE_MBTOWC = 1; then + AC_LIBOBJ([mbtowc]) + gl_PREREQ_MBTOWC + fi + gl_STDLIB_MODULE_INDICATOR([mbtowc]) + 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_MULTIARCH + gt_TYPE_SSIZE_T + AM_STDBOOL_H + gl_STDDEF_H + gl_STDINT_H + gl_STDIO_H + gl_STDLIB_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.2], [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], [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_FUNC_WCTOMB + if test $REPLACE_WCTOMB = 1; then + AC_LIBOBJ([wctomb]) + gl_PREREQ_WCTOMB + fi + gl_STDLIB_MODULE_INDICATOR([wctomb]) + gl_WCTYPE_H + gl_FUNC_WMEMCPY + if test $HAVE_WMEMCPY = 0; then + AC_LIBOBJ([wmemcpy]) + fi + gl_WCHAR_MODULE_INDICATOR([wmemcpy]) # End of code from modules m4_ifval(gl_LIBSOURCES_LIST, [ m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || @@ -424,6 +428,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/c-strcasecmp.c lib/c-strncasecmp.c lib/config.charset + lib/crc.c + lib/crc.h lib/getopt.c lib/getopt.in.h lib/getopt1.c @@ -470,6 +476,7 @@ AC_DEFUN([gl_FILE_LIST], [ 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 @@ -484,16 +491,19 @@ AC_DEFUN([gl_FILE_LIST], [ 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/codeset.m4 m4/config-h.m4 m4/configmake.m4 m4/extensions.m4 + m4/extern-inline.m4 m4/fcntl-o.m4 m4/getopt.m4 m4/gettext.m4 diff --git a/m4/gnulib-tool.m4 b/m4/gnulib-tool.m4 index a09ffc1..a588e15 100644 --- a/m4/gnulib-tool.m4 +++ b/m4/gnulib-tool.m4 @@ -1,5 +1,5 @@ # gnulib-tool.m4 serial 2 -dnl Copyright (C) 2004-2005, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2005, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/iconv.m4 b/m4/iconv.m4 index 6a47236..4b29c5f 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,5 +1,5 @@ # iconv.m4 serial 18 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 index aa86cf8..e992fa3 100644 --- a/m4/iconv_h.m4 +++ b/m4/iconv_h.m4 @@ -1,5 +1,5 @@ # iconv_h.m4 serial 8 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4 index 07f4849..e0bfd72 100644 --- a/m4/iconv_open.m4 +++ b/m4/iconv_open.m4 @@ -1,5 +1,5 @@ # iconv_open.m4 serial 14 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/include_next.m4 b/m4/include_next.m4 index a60a261..69ad3db 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,5 +1,5 @@ # include_next.m4 serial 23 -dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -192,56 +192,9 @@ dnl until we can assume autoconf 2.64 or newer. if test AS_VAR_GET(gl_header_exists) = yes; then AS_VAR_POPDEF([gl_header_exists]) ]) - AC_LANG_CONFTEST( - [AC_LANG_SOURCE( - [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]] - )]) - dnl AIX "xlc -E" and "cc -E" omit #line directives for header - dnl files that contain only a #include of other header files and - dnl no non-comment tokens of their own. This leads to a failure - dnl to detect the absolute name of , , - dnl and others. The workaround is to force preservation - dnl of comments through option -C. This ensures all necessary - dnl #line directives are present. GCC supports option -C as well. - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac -changequote(,) - case "$host_os" in - mingw*) - dnl For the sake of native Windows compilers (excluding gcc), - dnl treat backslash as a directory separator, like /. - dnl Actually, these compilers use a double-backslash as - dnl directory separator, inside the - dnl # line "filename" - dnl directives. - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - dnl A sed expression that turns a string into a basic regular - dnl expression, for use within "/.../". - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' -changequote([,]) - gl_header_literal_regex=`echo ']m4_defn([gl_HEADER_NAME])[' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ -changequote(,)dnl - s|^/[^/]|//&| -changequote([,])dnl - p - q - }' - dnl eval is necessary to expand gl_absname_cpp. - dnl Ultrix and Pyramid sh refuse to redirect output of eval, - dnl so use subshell. - AS_VAR_SET(gl_next_header, - ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | - sed -n "$gl_absolute_header_sed"`'"']) + gl_ABSOLUTE_HEADER_ONE(gl_HEADER_NAME) + AS_VAR_COPY([gl_header], [gl_cv_absolute_]AS_TR_SH(gl_HEADER_NAME)) + AS_VAR_SET(gl_next_header, ['"'$gl_header'"']) m4_if([$2], [check], [else AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>']) diff --git a/m4/inline.m4 b/m4/inline.m4 index 6fa9972..c49957f 100644 --- a/m4/inline.m4 +++ b/m4/inline.m4 @@ -1,5 +1,5 @@ # inline.m4 serial 4 -dnl Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4 index 6d89aeb..afa9acb 100644 --- a/m4/intdiv0.m4 +++ b/m4/intdiv0.m4 @@ -1,5 +1,5 @@ -# intdiv0.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2002, 2007-2008, 2010-2012 Free Software Foundation, Inc. +# intdiv0.m4 serial 6 (gettext-0.18.2) +dnl Copyright (C) 2002, 2007-2008, 2010-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -18,7 +18,7 @@ AC_DEFUN([gt_INTDIV0], changequote(,)dnl case "$host_os" in macos* | darwin[6-9]* | darwin[1-9][0-9]*) - # On MacOS X 10.2 or newer, just assume the same as when cross- + # On Mac OS X 10.2 or newer, just assume the same as when cross- # compiling. If we were to perform the real test, 1 Crash Report # dialog window would pop up. case "$host_cpu" in diff --git a/m4/intl.m4 b/m4/intl.m4 index d67e29c..1d782d1 100644 --- a/m4/intl.m4 +++ b/m4/intl.m4 @@ -1,5 +1,5 @@ -# intl.m4 serial 17c -dnl Copyright (C) 1995-2012 Free Software Foundation, Inc. +# intl.m4 serial 24 (gettext-0.18.3) +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,7 +17,7 @@ dnl Authors: dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2009. -AC_PREREQ([2.53]) +AC_PREREQ([2.60]) dnl Checks for all prerequisites of the intl subdirectory, dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, @@ -25,7 +25,7 @@ dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. AC_DEFUN([AM_INTL_SUBDIR], [ AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake + AC_REQUIRE([AC_PROG_MKDIR_P])dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([gt_GLIBC2])dnl @@ -55,21 +55,19 @@ AC_DEFUN([AM_INTL_SUBDIR], [AC_DEFINE([ptrdiff_t], [long], [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) ]) - AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) + AC_CHECK_HEADERS([features.h stddef.h stdlib.h string.h]) AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \ snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb]) dnl Use the _snprintf function only if it is declared (because on NetBSD it dnl is defined as a weak alias of snprintf; we prefer to use the latter). - gt_CHECK_DECL(_snprintf, [#include ]) - gt_CHECK_DECL(_snwprintf, [#include ]) + AC_CHECK_DECLS([_snprintf, _snwprintf], , , [#include ]) dnl Use the *_unlocked functions only if they are declared. dnl (because some of them were defined without being declared in Solaris dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL(getc_unlocked, [#include ]) + AC_CHECK_DECLS([getc_unlocked], , , [#include ]) case $gt_cv_func_printf_posix in *yes) HAVE_POSIX_PRINTF=1 ;; @@ -236,9 +234,7 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE], dnl (because some of them were defined without being declared in Solaris dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL([feof_unlocked], [#include ]) - gt_CHECK_DECL([fgets_unlocked], [#include ]) + AC_CHECK_DECLS([feof_unlocked, fgets_unlocked], , , [#include ]) AM_ICONV @@ -273,28 +269,3 @@ changequote([,])dnl INTLBISON=: fi ]) - - -dnl gt_CHECK_DECL(FUNC, INCLUDES) -dnl Check whether a function is declared. -AC_DEFUN([gt_CHECK_DECL], -[ - AC_CACHE_CHECK([whether $1 is declared], [ac_cv_have_decl_$1], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[$2]], - [[ -#ifndef $1 - char *p = (char *) $1; -#endif - ]])], - [ac_cv_have_decl_$1=yes], - [ac_cv_have_decl_$1=no])]) - if test $ac_cv_have_decl_$1 = yes; then - gt_value=1 - else - gt_value=0 - fi - AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], - [Define to 1 if you have the declaration of '$1', and to 0 if you don't.]) -]) diff --git a/m4/intldir.m4 b/m4/intldir.m4 index b81de61..73b672a 100644 --- a/m4/intldir.m4 +++ b/m4/intldir.m4 @@ -1,5 +1,5 @@ # intldir.m4 serial 2 (gettext-0.18) -dnl Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index dc2ddfe..8a045f6 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ -# intlmacosx.m4 serial 4 (gettext-0.18.2) -dnl Copyright (C) 2004-2012 Free Software Foundation, Inc. +# intlmacosx.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,11 +13,11 @@ dnl by the GNU Library General Public License, and the rest of the GNU dnl gettext package package is covered by the GNU General Public License. dnl They are *not* in the public domain. -dnl Checks for special options needed on MacOS X. +dnl Checks for special options needed on Mac OS X. dnl Defines INTL_MACOSX_LIBS. AC_DEFUN([gt_INTL_MACOSX], [ - dnl Check for API introduced in MacOS X 10.2. + dnl Check for API introduced in Mac OS X 10.2. AC_CACHE_CHECK([for CFPreferencesCopyAppValue], [gt_cv_func_CFPreferencesCopyAppValue], [gt_save_LIBS="$LIBS" @@ -31,9 +31,9 @@ AC_DEFUN([gt_INTL_MACOSX], LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) fi - dnl Check for API introduced in MacOS X 10.3. + dnl Check for API introduced in Mac OS X 10.3. AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" @@ -46,7 +46,7 @@ AC_DEFUN([gt_INTL_MACOSX], LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFLocaleCopyCurrent = yes; then AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) fi INTL_MACOSX_LIBS= if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then diff --git a/m4/intmax.m4 b/m4/intmax.m4 index e3b251f..f70ceee 100644 --- a/m4/intmax.m4 +++ b/m4/intmax.m4 @@ -1,5 +1,5 @@ # intmax.m4 serial 6 (gettext-0.18.2) -dnl Copyright (C) 2002-2005, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2005, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 index 977206f..00251e1 100644 --- a/m4/inttypes-pri.m4 +++ b/m4/inttypes-pri.m4 @@ -1,5 +1,5 @@ # inttypes-pri.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1997-2002, 2006, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2002, 2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 index 91c7bca..87be9cf 100644 --- a/m4/inttypes_h.m4 +++ b/m4/inttypes_h.m4 @@ -1,5 +1,5 @@ # inttypes_h.m4 serial 10 -dnl Copyright (C) 1997-2004, 2006, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4 index 4ed0eb6..7470ec5 100644 --- a/m4/lcmessage.m4 +++ b/m4/lcmessage.m4 @@ -1,5 +1,5 @@ # lcmessage.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1995-2002, 2004-2005, 2008-2012 Free Software Foundation, +dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index 4e1374d..ddc569f 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,33 +1,39 @@ -# lib-ld.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 1996-2003, 2009-2012 Free Software Foundation, Inc. +# lib-ld.m4 serial 6 +dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. +dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid +dnl collision with libtool.m4. -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. +dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +[# I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 /dev/null 2>&1; do + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" @@ -78,23 +85,26 @@ else fi AC_CACHE_VAL([acl_cv_path_LD], [if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do + IFS="$acl_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + case `"$acl_cv_path_LD" -v 2>&1 , - dnl e.g. on MacOS X 10.5. If does not define locale_t by + dnl e.g. on Mac OS X 10.5. If does not define locale_t by dnl itself, we assume that will do so. AC_CACHE_CHECK([whether locale.h defines locale_t], [gl_cv_header_locale_has_locale_t], diff --git a/m4/lock.m4 b/m4/lock.m4 index c0a6206..73a3c54 100644 --- a/m4/lock.m4 +++ b/m4/lock.m4 @@ -1,5 +1,5 @@ -# lock.m4 serial 11 (gettext-0.18.2) -dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. +# lock.m4 serial 13 (gettext-0.18.2) +dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ AC_DEFUN([gl_LOCK], [ AC_REQUIRE([gl_THREADLIB]) if test "$gl_threads_api" = posix; then - # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the + # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the # pthread_rwlock_* functions. AC_CHECK_TYPE([pthread_rwlock_t], [AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1], @@ -24,6 +24,9 @@ AC_DEFUN([gl_LOCK], [[ #if __FreeBSD__ == 4 error "No, in FreeBSD 4.0 recursive mutexes actually don't work." +#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \ + && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070) +error "No, in Mac OS X < 10.7 recursive mutexes actually don't work." #else int x = (int)PTHREAD_MUTEX_RECURSIVE; return !x; @@ -35,7 +38,5 @@ return !x; gl_PREREQ_LOCK ]) -# Prerequisites of lib/lock.c. -AC_DEFUN([gl_PREREQ_LOCK], [ - AC_REQUIRE([AC_C_INLINE]) -]) +# Prerequisites of lib/glthread/lock.c. +AC_DEFUN([gl_PREREQ_LOCK], [:]) diff --git a/m4/longlong.m4 b/m4/longlong.m4 index b9c65c7..eefb37c 100644 --- a/m4/longlong.m4 +++ b/m4/longlong.m4 @@ -1,5 +1,5 @@ # longlong.m4 serial 17 -dnl Copyright (C) 1999-2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 1999-2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index 8f829c8..45696f5 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,5 +1,5 @@ -# mbrtowc.m4 serial 25 -dnl Copyright (C) 2001-2002, 2004-2005, 2008-2012 Free Software Foundation, +# mbrtowc.m4 serial 26 +dnl Copyright (C) 2001-2002, 2004-2005, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -39,6 +39,7 @@ AC_DEFUN([gl_FUNC_MBRTOWC], gl_MBRTOWC_NULL_ARG2 gl_MBRTOWC_RETVAL gl_MBRTOWC_NUL_RETVAL + gl_MBRTOWC_EMPTY_INPUT case "$gl_cv_func_mbrtowc_null_arg1" in *yes) ;; *) AC_DEFINE([MBRTOWC_NULL_ARG1_BUG], [1], @@ -67,6 +68,14 @@ AC_DEFUN([gl_FUNC_MBRTOWC], REPLACE_MBRTOWC=1 ;; esac + case "$gl_cv_func_mbrtowc_empty_input" in + *yes) ;; + *) AC_DEFINE([MBRTOWC_EMPTY_INPUT_BUG], [1], + [Define if the mbrtowc function does not return (size_t) -2 + for empty input.]) + REPLACE_MBRTOWC=1 + ;; + esac fi fi ]) @@ -533,6 +542,41 @@ int main () ]) ]) +dnl Test whether mbrtowc returns the correct value on empty input. + +AC_DEFUN([gl_MBRTOWC_EMPTY_INPUT], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether mbrtowc works on empty input], + [gl_cv_func_mbrtowc_empty_input], + [ + dnl Initial guess, used when cross-compiling or when no suitable locale + dnl is present. +changequote(,)dnl + case "$host_os" in + # Guess no on AIX and glibc systems. + aix* | *-gnu*) + gl_cv_func_mbrtowc_empty_input="guessing no" ;; + *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; + esac +changequote([,])dnl + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ + #include + static wchar_t wc; + static mbstate_t mbs; + int + main (void) + { + return mbrtowc (&wc, "", 0, &mbs) == (size_t) -2; + }]])], + [gl_cv_func_mbrtowc_empty_input=no], + [gl_cv_func_mbrtowc_empty_input=yes], + [:]) + ]) +]) + # Prerequisites of lib/mbrtowc.c. AC_DEFUN([gl_PREREQ_MBRTOWC], [ : diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4 index da56c3d..e1598a1 100644 --- a/m4/mbsinit.m4 +++ b/m4/mbsinit.m4 @@ -1,5 +1,5 @@ # mbsinit.m4 serial 8 -dnl Copyright (C) 2008, 2010-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4 index a95f606..6967f35 100644 --- a/m4/mbsrtowcs.m4 +++ b/m4/mbsrtowcs.m4 @@ -1,5 +1,5 @@ # mbsrtowcs.m4 serial 13 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index 61a8190..068155a 100644 --- a/m4/mbstate_t.m4 +++ b/m4/mbstate_t.m4 @@ -1,5 +1,5 @@ # mbstate_t.m4 serial 13 -dnl Copyright (C) 2000-2002, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbtowc.m4 b/m4/mbtowc.m4 index fec0d25..cacfe16 100644 --- a/m4/mbtowc.m4 +++ b/m4/mbtowc.m4 @@ -1,5 +1,5 @@ # mbtowc.m4 serial 2 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/memchr.m4 b/m4/memchr.m4 index 0040294..b9f126c 100644 --- a/m4/memchr.m4 +++ b/m4/memchr.m4 @@ -1,5 +1,5 @@ # memchr.m4 serial 12 -dnl Copyright (C) 2002-2004, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4 index 4613cbe..94ae2e2 100644 --- a/m4/mmap-anon.m4 +++ b/m4/mmap-anon.m4 @@ -1,5 +1,5 @@ -# mmap-anon.m4 serial 9 -dnl Copyright (C) 2005, 2007, 2009-2012 Free Software Foundation, Inc. +# mmap-anon.m4 serial 10 +dnl Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,7 +9,7 @@ dnl with or without modifications, as long as this notice is preserved. # - On Linux, AIX, OSF/1, Solaris, Cygwin, Interix, Haiku, both MAP_ANONYMOUS # and MAP_ANON exist and have the same value. # - On HP-UX, only MAP_ANONYMOUS exists. -# - On MacOS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists. +# - On Mac OS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists. # - On IRIX, neither exists, and a file descriptor opened to /dev/zero must be # used. @@ -27,18 +27,18 @@ AC_DEFUN([gl_FUNC_MMAP_ANON], gl_have_mmap_anonymous=no if test $gl_have_mmap = yes; then AC_MSG_CHECKING([for MAP_ANONYMOUS]) - AC_EGREP_CPP([I cant identify this map], [ + AC_EGREP_CPP([I cannot identify this map], [ #include #ifdef MAP_ANONYMOUS - I cant identify this map + I cannot identify this map #endif ], [gl_have_mmap_anonymous=yes]) if test $gl_have_mmap_anonymous != yes; then - AC_EGREP_CPP([I cant identify this map], [ + AC_EGREP_CPP([I cannot identify this map], [ #include #ifdef MAP_ANON - I cant identify this map + I cannot identify this map #endif ], [AC_DEFINE([MAP_ANONYMOUS], [MAP_ANON], diff --git a/m4/multiarch.m4 b/m4/multiarch.m4 index b424dce..2cb956d 100644 --- a/m4/multiarch.m4 +++ b/m4/multiarch.m4 @@ -1,12 +1,12 @@ -# multiarch.m4 serial 6 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +# multiarch.m4 serial 7 +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. # Determine whether the compiler is or may be producing universal binaries. # -# On MacOS X 10.5 and later systems, the user can create libraries and +# On Mac OS X 10.5 and later systems, the user can create libraries and # executables that work on multiple system types--known as "fat" or # "universal" binaries--by specifying multiple '-arch' options to the # compiler but only a single '-arch' option to the preprocessor. Like diff --git a/m4/nls.m4 b/m4/nls.m4 index 0866677..53cdc8b 100644 --- a/m4/nls.m4 +++ b/m4/nls.m4 @@ -1,5 +1,5 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2012 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/nocrash.m4 b/m4/nocrash.m4 index 08ef825..5a5d77d 100644 --- a/m4/nocrash.m4 +++ b/m4/nocrash.m4 @@ -1,5 +1,5 @@ -# nocrash.m4 serial 3 -dnl Copyright (C) 2005, 2009-2012 Free Software Foundation, Inc. +# nocrash.m4 serial 4 +dnl Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -18,7 +18,7 @@ dnl int main() { nocrash_init(); ... } AC_DEFUN([GL_NOCRASH],[[ #include #if defined __MACH__ && defined __APPLE__ -/* Avoid a crash on MacOS X. */ +/* Avoid a crash on Mac OS X. */ #include #include #include diff --git a/m4/off_t.m4 b/m4/off_t.m4 index dfca2df..f5885b3 100644 --- a/m4/off_t.m4 +++ b/m4/off_t.m4 @@ -1,5 +1,5 @@ # off_t.m4 serial 1 -dnl Copyright (C) 2012 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/po.m4 b/m4/po.m4 index 05d8f7b..bd210c5 100644 --- a/m4/po.m4 +++ b/m4/po.m4 @@ -1,5 +1,5 @@ -# po.m4 serial 17b -dnl Copyright (C) 1995-2012 Free Software Foundation, Inc. +# po.m4 serial 21 (gettext-0.18.3) +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,14 +17,15 @@ dnl Authors: dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ([2.50]) +AC_PREREQ([2.60]) dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake + AC_REQUIRE([AC_PROG_MKDIR_P])dnl + AC_REQUIRE([AC_PROG_SED])dnl AC_REQUIRE([AM_NLS])dnl dnl Release version of the gettext macros. This is used to ensure that @@ -102,7 +103,7 @@ changequote([,])dnl case "$ac_file" in */Makefile.in) # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. @@ -227,7 +228,7 @@ AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], changequote(,)dnl # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4 index 0b9da42..3be95c1 100644 --- a/m4/printf-posix.m4 +++ b/m4/printf-posix.m4 @@ -1,5 +1,5 @@ # printf-posix.m4 serial 6 (gettext-0.18.2) -dnl Copyright (C) 2003, 2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/progtest.m4 b/m4/progtest.m4 index ce3abbc..b499f79 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,5 +1,5 @@ # progtest.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1996-2003, 2005, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/size_max.m4 b/m4/size_max.m4 index 5a8162b..7e192d5 100644 --- a/m4/size_max.m4 +++ b/m4/size_max.m4 @@ -1,5 +1,5 @@ # size_max.m4 serial 10 -dnl Copyright (C) 2003, 2005-2006, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4 index 209d64c..fbe1d06 100644 --- a/m4/ssize_t.m4 +++ b/m4/ssize_t.m4 @@ -1,5 +1,5 @@ # ssize_t.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2001-2003, 2006, 2010-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2003, 2006, 2010-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdbool.m4 b/m4/stdbool.m4 index eabfa64..006ed52 100644 --- a/m4/stdbool.m4 +++ b/m4/stdbool.m4 @@ -1,6 +1,6 @@ # Check for stdbool.h that conforms to C99. -dnl Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 index cc11609..c555e29 100644 --- a/m4/stddef_h.m4 +++ b/m4/stddef_h.m4 @@ -1,6 +1,6 @@ dnl A placeholder for POSIX 2008 , for platforms that have issues. # stddef_h.m4 serial 4 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdint.m4 b/m4/stdint.m4 index 28d342e..1981d9d 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ # stdint.m4 serial 43 -dnl Copyright (C) 2001-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 index 581de96..7fc2ce9 100644 --- a/m4/stdint_h.m4 +++ b/m4/stdint_h.m4 @@ -1,5 +1,5 @@ # stdint_h.m4 serial 9 -dnl Copyright (C) 1997-2004, 2006, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index b03393b..d15913a 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,5 +1,5 @@ -# stdio_h.m4 serial 41 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +# stdio_h.m4 serial 43 +dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,13 +7,14 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_STDIO_H], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - AC_REQUIRE([AC_C_INLINE]) gl_NEXT_HEADERS([stdio.h]) dnl No need to create extra modules for these functions. Everyone who uses dnl likely needs them. GNULIB_FSCANF=1 + gl_MODULE_INDICATOR([fscanf]) GNULIB_SCANF=1 + gl_MODULE_INDICATOR([scanf]) GNULIB_FGETC=1 GNULIB_GETC=1 GNULIB_GETCHAR=1 diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index ab43728..03b448b 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ -# stdlib_h.m4 serial 41 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +# stdlib_h.m4 serial 42 +dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -22,7 +22,7 @@ AC_DEFUN([gl_STDLIB_H], ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps posix_openpt ptsname ptsname_r random random_r realpath rpmatch - setenv setstate setstate_r srandom srandom_r + secure_getenv setenv setstate setstate_r srandom srandom_r strtod strtoll strtoull unlockpt unsetenv]) ]) @@ -60,6 +60,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) GNULIB_REALPATH=0; AC_SUBST([GNULIB_REALPATH]) GNULIB_RPMATCH=0; AC_SUBST([GNULIB_RPMATCH]) + GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV]) GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV]) GNULIB_STRTOD=0; AC_SUBST([GNULIB_STRTOD]) GNULIB_STRTOLL=0; AC_SUBST([GNULIB_STRTOLL]) @@ -88,6 +89,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], HAVE_RANDOM_R=1; AC_SUBST([HAVE_RANDOM_R]) 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_STRTOD=1; AC_SUBST([HAVE_STRTOD]) @@ -102,6 +104,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], REPLACE_MALLOC=0; AC_SUBST([REPLACE_MALLOC]) REPLACE_MBTOWC=0; AC_SUBST([REPLACE_MBTOWC]) REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP]) + REPLACE_PTSNAME=0; AC_SUBST([REPLACE_PTSNAME]) REPLACE_PTSNAME_R=0; AC_SUBST([REPLACE_PTSNAME_R]) REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) diff --git a/m4/string_h.m4 b/m4/string_h.m4 index 5677e09..64e683f 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -1,6 +1,6 @@ # Configure a GNU-like replacement for . -# Copyright (C) 2007-2012 Free Software Foundation, Inc. +# Copyright (C) 2007-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/strstr.m4 b/m4/strstr.m4 index b8f94bf..33cd7a3 100644 --- a/m4/strstr.m4 +++ b/m4/strstr.m4 @@ -1,5 +1,5 @@ # strstr.m4 serial 16 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index 8d4e7e1..114d828 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,5 +1,5 @@ -# sys_socket_h.m4 serial 22 -dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. +# sys_socket_h.m4 serial 23 +dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,6 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET], [ AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_C_INLINE]) dnl On OSF/1, the functions recv(), send(), recvfrom(), sendto() have dnl old-style declarations (with return type 'int' instead of 'ssize_t') diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index f45dee1..eaa7642 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,5 +1,5 @@ -# sys_stat_h.m4 serial 27 -*- Autoconf -*- -dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. +# sys_stat_h.m4 serial 28 -*- Autoconf -*- +dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,9 +11,6 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], [ AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) - dnl For the mkdir substitute. - AC_REQUIRE([AC_C_INLINE]) - dnl Check for broken stat macros. AC_REQUIRE([AC_HEADER_STAT]) diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 index 26eaf8e..5c79300 100644 --- a/m4/sys_time_h.m4 +++ b/m4/sys_time_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for . # serial 8 -# Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -52,7 +52,9 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], dnl (in and for mingw64, in only dnl for MSVC) with a tv_sec field of type 'long' (32-bit!), which is dnl smaller than the 'time_t' type mandated by POSIX. - AC_CACHE_CHECK([for correct struct timeval.tv_sec member], + dnl On OpenBSD 5.1 amd64, tv_sec is 64 bits and time_t 32 bits, but + dnl that is good enough. + AC_CACHE_CHECK([for wide-enough struct timeval.tv_sec member], [gl_cv_sys_struct_timeval_tv_sec], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( @@ -65,7 +67,9 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], #endif ]], [[static struct timeval x; - typedef int verify_tv_sec_type[sizeof (x.tv_sec) == sizeof (time_t) ? 1 : -1]; + typedef int verify_tv_sec_type[ + sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1 + ]; ]])], [gl_cv_sys_struct_timeval_tv_sec=yes], [gl_cv_sys_struct_timeval_tv_sec=no]) diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 index f11eef2..9748905 100644 --- a/m4/sys_types_h.m4 +++ b/m4/sys_types_h.m4 @@ -1,10 +1,10 @@ -# sys_types_h.m4 serial 4 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +# sys_types_h.m4 serial 5 +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_SYS_TYPES_H], +AC_DEFUN_ONCE([gl_SYS_TYPES_H], [ AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) gl_NEXT_HEADERS([sys/types.h]) diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 index 9cedb67..a881702 100644 --- a/m4/threadlib.m4 +++ b/m4/threadlib.m4 @@ -1,5 +1,5 @@ -# threadlib.m4 serial 9 (gettext-0.18.2) -dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. +# threadlib.m4 serial 10 (gettext-0.18.2) +dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -319,50 +319,50 @@ AC_DEFUN([gl_DISABLE_THREADS], [ dnl Survey of platforms: dnl -dnl Platform Available Compiler Supports test-lock -dnl flavours option weak result -dnl --------------- --------- --------- -------- --------- -dnl Linux 2.4/glibc posix -lpthread Y OK +dnl Platform Available Compiler Supports test-lock +dnl flavours option weak result +dnl --------------- --------- --------- -------- --------- +dnl Linux 2.4/glibc posix -lpthread Y OK dnl -dnl GNU Hurd/glibc posix +dnl GNU Hurd/glibc posix dnl -dnl FreeBSD 5.3 posix -lc_r Y -dnl posix -lkse ? Y -dnl posix -lpthread ? Y -dnl posix -lthr Y +dnl FreeBSD 5.3 posix -lc_r Y +dnl posix -lkse ? Y +dnl posix -lpthread ? Y +dnl posix -lthr Y dnl -dnl FreeBSD 5.2 posix -lc_r Y -dnl posix -lkse Y -dnl posix -lthr Y +dnl FreeBSD 5.2 posix -lc_r Y +dnl posix -lkse Y +dnl posix -lthr Y dnl -dnl FreeBSD 4.0,4.10 posix -lc_r Y OK +dnl FreeBSD 4.0,4.10 posix -lc_r Y OK dnl -dnl NetBSD 1.6 -- +dnl NetBSD 1.6 -- dnl -dnl OpenBSD 3.4 posix -lpthread Y OK +dnl OpenBSD 3.4 posix -lpthread Y OK dnl -dnl MacOS X 10.[123] posix -lpthread Y OK +dnl Mac OS X 10.[123] posix -lpthread Y OK dnl -dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK -dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK +dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK +dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK dnl -dnl HP-UX 11 posix -lpthread N (cc) OK +dnl HP-UX 11 posix -lpthread N (cc) OK dnl Y (gcc) dnl -dnl IRIX 6.5 posix -lpthread Y 0.5 +dnl IRIX 6.5 posix -lpthread Y 0.5 dnl -dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK +dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK dnl -dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK +dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK dnl -lpthread (gcc) Y dnl -dnl Cygwin posix -lpthread Y OK +dnl Cygwin posix -lpthread Y OK dnl -dnl Any of the above pth -lpth 0.0 +dnl Any of the above pth -lpth 0.0 dnl -dnl Mingw windows N OK +dnl Mingw windows N OK dnl -dnl BeOS 5 -- +dnl BeOS 5 -- dnl dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is dnl turned off: diff --git a/m4/time_h.m4 b/m4/time_h.m4 index b88da76..9852778 100644 --- a/m4/time_h.m4 +++ b/m4/time_h.m4 @@ -1,8 +1,8 @@ # Configure a more-standard replacement for . -# Copyright (C) 2000-2001, 2003-2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. -# serial 6 +# serial 8 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -25,7 +25,7 @@ AC_DEFUN([gl_HEADER_TIME_H_BODY], AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) ]) -dnl Define HAVE_STRUCT_TIMESPEC if 'struct timespec' is declared +dnl Check whether 'struct timespec' is declared dnl in time.h, sys/time.h, or pthread.h. AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], @@ -106,4 +106,13 @@ AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], REPLACE_MKTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_MKTIME]) REPLACE_NANOSLEEP=GNULIB_PORTCHECK; AC_SUBST([REPLACE_NANOSLEEP]) REPLACE_TIMEGM=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TIMEGM]) + + dnl Hack so that the time module doesn't depend on the sys_time module. + dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent. + : ${GNULIB_GETTIMEOFDAY=0}; AC_SUBST([GNULIB_GETTIMEOFDAY]) + dnl Second, it's OK to not use GNULIB_PORTCHECK for REPLACE_GMTIME + dnl and REPLACE_LOCALTIME, as portability to Solaris 2.6 and earlier + dnl is no longer a big deal. + REPLACE_GMTIME=0; AC_SUBST([REPLACE_GMTIME]) + REPLACE_LOCALTIME=0; AC_SUBST([REPLACE_LOCALTIME]) ]) diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4 index 983b675..0a94f17 100644 --- a/m4/uintmax_t.m4 +++ b/m4/uintmax_t.m4 @@ -1,5 +1,5 @@ # uintmax_t.m4 serial 12 -dnl Copyright (C) 1997-2004, 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index 7e7651b..1fa197e 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,5 +1,5 @@ -# unistd_h.m4 serial 65 -dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. +# unistd_h.m4 serial 67 +dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,7 +11,6 @@ AC_DEFUN([gl_UNISTD_H], dnl Use AC_REQUIRE here, so that the default behavior below is expanded dnl once only, before all statements that occur in other macros. AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - AC_REQUIRE([AC_C_INLINE]) gl_CHECK_NEXT_HEADERS([unistd.h]) if test $ac_cv_header_unistd_h = yes; then @@ -161,6 +160,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_FTRUNCATE=0; AC_SUBST([REPLACE_FTRUNCATE]) REPLACE_GETCWD=0; AC_SUBST([REPLACE_GETCWD]) REPLACE_GETDOMAINNAME=0; AC_SUBST([REPLACE_GETDOMAINNAME]) + REPLACE_GETDTABLESIZE=0; AC_SUBST([REPLACE_GETDTABLESIZE]) REPLACE_GETLOGIN_R=0; AC_SUBST([REPLACE_GETLOGIN_R]) REPLACE_GETGROUPS=0; AC_SUBST([REPLACE_GETGROUPS]) REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE]) diff --git a/m4/visibility.m4 b/m4/visibility.m4 index 7b24d39..552e397 100644 --- a/m4/visibility.m4 +++ b/m4/visibility.m4 @@ -1,5 +1,5 @@ -# visibility.m4 serial 4 (gettext-0.18.2) -dnl Copyright (C) 2005, 2008, 2010-2012 Free Software Foundation, Inc. +# visibility.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 2005, 2008, 2010-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,7 +12,7 @@ dnl __attribute__((__visibility__("hidden"))) and dnl __attribute__((__visibility__("default"))). dnl Does *not* test for __visibility__("protected") - which has tricky dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on -dnl MacOS X. +dnl Mac OS X. dnl Does *not* test for __visibility__("internal") - which has processor dnl dependent semantics. dnl Does *not* test for #pragma GCC visibility push(hidden) - which is diff --git a/m4/warn-on-use.m4 b/m4/warn-on-use.m4 index a77802e..cc690f8 100644 --- a/m4/warn-on-use.m4 +++ b/m4/warn-on-use.m4 @@ -1,5 +1,5 @@ # warn-on-use.m4 serial 5 -dnl Copyright (C) 2010-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index c7a8b2d..85db952 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -1,6 +1,6 @@ dnl A placeholder for ISO C99 , for platforms that have issues. -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 index 534735d..839a04c 100644 --- a/m4/wchar_t.m4 +++ b/m4/wchar_t.m4 @@ -1,5 +1,5 @@ # wchar_t.m4 serial 4 (gettext-0.18.2) -dnl Copyright (C) 2002-2003, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4 index 00d7302..844ef6a 100644 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,5 +1,5 @@ # wcrtomb.m4 serial 11 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wcsdup.m4 b/m4/wcsdup.m4 index d8ff40a..52ae488 100644 --- a/m4/wcsdup.m4 +++ b/m4/wcsdup.m4 @@ -1,5 +1,5 @@ # wcsdup.m4 serial 2 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wctob.m4 b/m4/wctob.m4 index 786c881..41f57af 100644 --- a/m4/wctob.m4 +++ b/m4/wctob.m4 @@ -1,5 +1,5 @@ # wctob.m4 serial 10 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wctomb.m4 b/m4/wctomb.m4 index 88fd6be..3b4ff79 100644 --- a/m4/wctomb.m4 +++ b/m4/wctomb.m4 @@ -1,5 +1,5 @@ # wctomb.m4 serial 2 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 index 4b19f64..3fac0ee 100644 --- a/m4/wctype_h.m4 +++ b/m4/wctype_h.m4 @@ -1,8 +1,8 @@ -# wctype_h.m4 serial 17 +# wctype_h.m4 serial 18 dnl A placeholder for ISO C99 , for platforms that lack it. -dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -22,8 +22,6 @@ AC_DEFUN([gl_WCTYPE_H], fi AC_SUBST([HAVE_ISWCNTRL]) - AC_REQUIRE([AC_C_INLINE]) - AC_REQUIRE([gt_TYPE_WINT_T]) if test $gt_cv_c_wint_t = yes; then HAVE_WINT_T=1 diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 index 3260cce..9b07b07 100644 --- a/m4/wint_t.m4 +++ b/m4/wint_t.m4 @@ -1,5 +1,5 @@ # wint_t.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2003, 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wmemcpy.m4 b/m4/wmemcpy.m4 index 071076f..bd35770 100644 --- a/m4/wmemcpy.m4 +++ b/m4/wmemcpy.m4 @@ -1,5 +1,5 @@ # wmemcpy.m4 serial 3 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xsize.m4 b/m4/xsize.m4 index b3b7fee..3af23ec 100644 --- a/m4/xsize.m4 +++ b/m4/xsize.m4 @@ -1,5 +1,5 @@ -# xsize.m4 serial 4 -dnl Copyright (C) 2003-2004, 2008-2012 Free Software Foundation, Inc. +# xsize.m4 serial 5 +dnl Copyright (C) 2003-2004, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,6 +8,5 @@ AC_DEFUN([gl_XSIZE], [ dnl Prerequisites of lib/xsize.h. AC_REQUIRE([gl_SIZE_MAX]) - AC_REQUIRE([AC_C_INLINE]) AC_CHECK_HEADERS([stdint.h]) ]) diff --git a/src/Makefile.in b/src/Makefile.in index 4e8599c..08b8e81 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,12 +17,12 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2012, John Zaitseff # +# Copyright (C) 1990-2014, John Zaitseff # # # ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 362 2012-03-14 15:36:23Z john $ +# $Id: Makefile.am 514 2014-05-22 01:05:51Z john $ # # This file, src/Makefile.am, contains the source-code Makefile for Star # Traders. It needs to be processed by automake to produce the @@ -44,23 +43,51 @@ # along with this program. If not, see http://www.gnu.org/licenses/. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -80,18 +107,22 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = trader$(EXEEXT) subdir = src -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/assert.m4 $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/assert.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ $(top_srcdir)/m4/ax_c___attribute__.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/ax_with_curses.m4 $(top_srcdir)/m4/btowc.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \ @@ -135,14 +166,38 @@ am_trader_OBJECTS = trader-trader.$(OBJEXT) trader-globals.$(OBJEXT) \ trader-utils.$(OBJEXT) trader_OBJECTS = $(am_trader_OBJECTS) trader_DEPENDENCIES = $(top_builddir)/lib/libgnu.a +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(trader_SOURCES) DIST_SOURCES = $(trader_SOURCES) am__can_run_installinfo = \ @@ -150,12 +205,30 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ @@ -331,6 +404,7 @@ GNULIB_RENAMEAT = @GNULIB_RENAMEAT@ GNULIB_RMDIR = @GNULIB_RMDIR@ GNULIB_RPMATCH = @GNULIB_RPMATCH@ GNULIB_SCANF = @GNULIB_SCANF@ +GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ @@ -536,6 +610,7 @@ HAVE_READLINKAT = @HAVE_READLINKAT@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ +HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -720,11 +795,13 @@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ +REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ICONV = @REPLACE_ICONV@ REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@ REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@ @@ -735,6 +812,7 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ +REPLACE_LOCALTIME = @REPLACE_LOCALTIME@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ @@ -760,6 +838,7 @@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ +REPLACE_PTSNAME = @REPLACE_PTSNAME@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ @@ -819,6 +898,7 @@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -889,6 +969,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -957,10 +1038,11 @@ install-binPROGRAMS: $(bin_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -981,16 +1063,18 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + trader$(EXEEXT): $(trader_OBJECTS) $(trader_DEPENDENCIES) $(EXTRA_trader_DEPENDENCIES) @rm -f trader$(EXEEXT) - $(LINK) $(trader_OBJECTS) $(trader_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(trader_OBJECTS) $(trader_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1009,165 +1093,154 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trader-utils.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` trader-trader.o: trader.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-trader.o -MD -MP -MF $(DEPDIR)/trader-trader.Tpo -c -o trader-trader.o `test -f 'trader.c' || echo '$(srcdir)/'`trader.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-trader.Tpo $(DEPDIR)/trader-trader.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='trader.c' object='trader-trader.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-trader.o -MD -MP -MF $(DEPDIR)/trader-trader.Tpo -c -o trader-trader.o `test -f 'trader.c' || echo '$(srcdir)/'`trader.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-trader.Tpo $(DEPDIR)/trader-trader.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='trader.c' object='trader-trader.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-trader.o `test -f 'trader.c' || echo '$(srcdir)/'`trader.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-trader.o `test -f 'trader.c' || echo '$(srcdir)/'`trader.c trader-trader.obj: trader.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-trader.obj -MD -MP -MF $(DEPDIR)/trader-trader.Tpo -c -o trader-trader.obj `if test -f 'trader.c'; then $(CYGPATH_W) 'trader.c'; else $(CYGPATH_W) '$(srcdir)/trader.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-trader.Tpo $(DEPDIR)/trader-trader.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='trader.c' object='trader-trader.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-trader.obj -MD -MP -MF $(DEPDIR)/trader-trader.Tpo -c -o trader-trader.obj `if test -f 'trader.c'; then $(CYGPATH_W) 'trader.c'; else $(CYGPATH_W) '$(srcdir)/trader.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-trader.Tpo $(DEPDIR)/trader-trader.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='trader.c' object='trader-trader.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-trader.obj `if test -f 'trader.c'; then $(CYGPATH_W) 'trader.c'; else $(CYGPATH_W) '$(srcdir)/trader.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-trader.obj `if test -f 'trader.c'; then $(CYGPATH_W) 'trader.c'; else $(CYGPATH_W) '$(srcdir)/trader.c'; fi` trader-globals.o: globals.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-globals.o -MD -MP -MF $(DEPDIR)/trader-globals.Tpo -c -o trader-globals.o `test -f 'globals.c' || echo '$(srcdir)/'`globals.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-globals.Tpo $(DEPDIR)/trader-globals.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='globals.c' object='trader-globals.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-globals.o -MD -MP -MF $(DEPDIR)/trader-globals.Tpo -c -o trader-globals.o `test -f 'globals.c' || echo '$(srcdir)/'`globals.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-globals.Tpo $(DEPDIR)/trader-globals.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='globals.c' object='trader-globals.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-globals.o `test -f 'globals.c' || echo '$(srcdir)/'`globals.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-globals.o `test -f 'globals.c' || echo '$(srcdir)/'`globals.c trader-globals.obj: globals.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-globals.obj -MD -MP -MF $(DEPDIR)/trader-globals.Tpo -c -o trader-globals.obj `if test -f 'globals.c'; then $(CYGPATH_W) 'globals.c'; else $(CYGPATH_W) '$(srcdir)/globals.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-globals.Tpo $(DEPDIR)/trader-globals.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='globals.c' object='trader-globals.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-globals.obj -MD -MP -MF $(DEPDIR)/trader-globals.Tpo -c -o trader-globals.obj `if test -f 'globals.c'; then $(CYGPATH_W) 'globals.c'; else $(CYGPATH_W) '$(srcdir)/globals.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-globals.Tpo $(DEPDIR)/trader-globals.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='globals.c' object='trader-globals.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-globals.obj `if test -f 'globals.c'; then $(CYGPATH_W) 'globals.c'; else $(CYGPATH_W) '$(srcdir)/globals.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-globals.obj `if test -f 'globals.c'; then $(CYGPATH_W) 'globals.c'; else $(CYGPATH_W) '$(srcdir)/globals.c'; fi` trader-game.o: game.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-game.o -MD -MP -MF $(DEPDIR)/trader-game.Tpo -c -o trader-game.o `test -f 'game.c' || echo '$(srcdir)/'`game.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-game.Tpo $(DEPDIR)/trader-game.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='game.c' object='trader-game.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-game.o -MD -MP -MF $(DEPDIR)/trader-game.Tpo -c -o trader-game.o `test -f 'game.c' || echo '$(srcdir)/'`game.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-game.Tpo $(DEPDIR)/trader-game.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='game.c' object='trader-game.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-game.o `test -f 'game.c' || echo '$(srcdir)/'`game.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-game.o `test -f 'game.c' || echo '$(srcdir)/'`game.c trader-game.obj: game.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-game.obj -MD -MP -MF $(DEPDIR)/trader-game.Tpo -c -o trader-game.obj `if test -f 'game.c'; then $(CYGPATH_W) 'game.c'; else $(CYGPATH_W) '$(srcdir)/game.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-game.Tpo $(DEPDIR)/trader-game.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='game.c' object='trader-game.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-game.obj -MD -MP -MF $(DEPDIR)/trader-game.Tpo -c -o trader-game.obj `if test -f 'game.c'; then $(CYGPATH_W) 'game.c'; else $(CYGPATH_W) '$(srcdir)/game.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-game.Tpo $(DEPDIR)/trader-game.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='game.c' object='trader-game.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-game.obj `if test -f 'game.c'; then $(CYGPATH_W) 'game.c'; else $(CYGPATH_W) '$(srcdir)/game.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-game.obj `if test -f 'game.c'; then $(CYGPATH_W) 'game.c'; else $(CYGPATH_W) '$(srcdir)/game.c'; fi` trader-move.o: move.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-move.o -MD -MP -MF $(DEPDIR)/trader-move.Tpo -c -o trader-move.o `test -f 'move.c' || echo '$(srcdir)/'`move.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-move.Tpo $(DEPDIR)/trader-move.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='move.c' object='trader-move.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-move.o -MD -MP -MF $(DEPDIR)/trader-move.Tpo -c -o trader-move.o `test -f 'move.c' || echo '$(srcdir)/'`move.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-move.Tpo $(DEPDIR)/trader-move.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='move.c' object='trader-move.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-move.o `test -f 'move.c' || echo '$(srcdir)/'`move.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-move.o `test -f 'move.c' || echo '$(srcdir)/'`move.c trader-move.obj: move.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-move.obj -MD -MP -MF $(DEPDIR)/trader-move.Tpo -c -o trader-move.obj `if test -f 'move.c'; then $(CYGPATH_W) 'move.c'; else $(CYGPATH_W) '$(srcdir)/move.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-move.Tpo $(DEPDIR)/trader-move.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='move.c' object='trader-move.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-move.obj -MD -MP -MF $(DEPDIR)/trader-move.Tpo -c -o trader-move.obj `if test -f 'move.c'; then $(CYGPATH_W) 'move.c'; else $(CYGPATH_W) '$(srcdir)/move.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-move.Tpo $(DEPDIR)/trader-move.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='move.c' object='trader-move.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-move.obj `if test -f 'move.c'; then $(CYGPATH_W) 'move.c'; else $(CYGPATH_W) '$(srcdir)/move.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-move.obj `if test -f 'move.c'; then $(CYGPATH_W) 'move.c'; else $(CYGPATH_W) '$(srcdir)/move.c'; fi` trader-exch.o: exch.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-exch.o -MD -MP -MF $(DEPDIR)/trader-exch.Tpo -c -o trader-exch.o `test -f 'exch.c' || echo '$(srcdir)/'`exch.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-exch.Tpo $(DEPDIR)/trader-exch.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='exch.c' object='trader-exch.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-exch.o -MD -MP -MF $(DEPDIR)/trader-exch.Tpo -c -o trader-exch.o `test -f 'exch.c' || echo '$(srcdir)/'`exch.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-exch.Tpo $(DEPDIR)/trader-exch.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exch.c' object='trader-exch.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-exch.o `test -f 'exch.c' || echo '$(srcdir)/'`exch.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-exch.o `test -f 'exch.c' || echo '$(srcdir)/'`exch.c trader-exch.obj: exch.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-exch.obj -MD -MP -MF $(DEPDIR)/trader-exch.Tpo -c -o trader-exch.obj `if test -f 'exch.c'; then $(CYGPATH_W) 'exch.c'; else $(CYGPATH_W) '$(srcdir)/exch.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-exch.Tpo $(DEPDIR)/trader-exch.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='exch.c' object='trader-exch.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-exch.obj -MD -MP -MF $(DEPDIR)/trader-exch.Tpo -c -o trader-exch.obj `if test -f 'exch.c'; then $(CYGPATH_W) 'exch.c'; else $(CYGPATH_W) '$(srcdir)/exch.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-exch.Tpo $(DEPDIR)/trader-exch.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exch.c' object='trader-exch.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-exch.obj `if test -f 'exch.c'; then $(CYGPATH_W) 'exch.c'; else $(CYGPATH_W) '$(srcdir)/exch.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-exch.obj `if test -f 'exch.c'; then $(CYGPATH_W) 'exch.c'; else $(CYGPATH_W) '$(srcdir)/exch.c'; fi` trader-fileio.o: fileio.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-fileio.o -MD -MP -MF $(DEPDIR)/trader-fileio.Tpo -c -o trader-fileio.o `test -f 'fileio.c' || echo '$(srcdir)/'`fileio.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-fileio.Tpo $(DEPDIR)/trader-fileio.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fileio.c' object='trader-fileio.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-fileio.o -MD -MP -MF $(DEPDIR)/trader-fileio.Tpo -c -o trader-fileio.o `test -f 'fileio.c' || echo '$(srcdir)/'`fileio.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-fileio.Tpo $(DEPDIR)/trader-fileio.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fileio.c' object='trader-fileio.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-fileio.o `test -f 'fileio.c' || echo '$(srcdir)/'`fileio.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-fileio.o `test -f 'fileio.c' || echo '$(srcdir)/'`fileio.c trader-fileio.obj: fileio.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-fileio.obj -MD -MP -MF $(DEPDIR)/trader-fileio.Tpo -c -o trader-fileio.obj `if test -f 'fileio.c'; then $(CYGPATH_W) 'fileio.c'; else $(CYGPATH_W) '$(srcdir)/fileio.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-fileio.Tpo $(DEPDIR)/trader-fileio.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fileio.c' object='trader-fileio.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-fileio.obj -MD -MP -MF $(DEPDIR)/trader-fileio.Tpo -c -o trader-fileio.obj `if test -f 'fileio.c'; then $(CYGPATH_W) 'fileio.c'; else $(CYGPATH_W) '$(srcdir)/fileio.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-fileio.Tpo $(DEPDIR)/trader-fileio.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fileio.c' object='trader-fileio.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-fileio.obj `if test -f 'fileio.c'; then $(CYGPATH_W) 'fileio.c'; else $(CYGPATH_W) '$(srcdir)/fileio.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-fileio.obj `if test -f 'fileio.c'; then $(CYGPATH_W) 'fileio.c'; else $(CYGPATH_W) '$(srcdir)/fileio.c'; fi` trader-help.o: help.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-help.o -MD -MP -MF $(DEPDIR)/trader-help.Tpo -c -o trader-help.o `test -f 'help.c' || echo '$(srcdir)/'`help.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-help.Tpo $(DEPDIR)/trader-help.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='help.c' object='trader-help.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-help.o -MD -MP -MF $(DEPDIR)/trader-help.Tpo -c -o trader-help.o `test -f 'help.c' || echo '$(srcdir)/'`help.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-help.Tpo $(DEPDIR)/trader-help.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='help.c' object='trader-help.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-help.o `test -f 'help.c' || echo '$(srcdir)/'`help.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-help.o `test -f 'help.c' || echo '$(srcdir)/'`help.c trader-help.obj: help.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-help.obj -MD -MP -MF $(DEPDIR)/trader-help.Tpo -c -o trader-help.obj `if test -f 'help.c'; then $(CYGPATH_W) 'help.c'; else $(CYGPATH_W) '$(srcdir)/help.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-help.Tpo $(DEPDIR)/trader-help.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='help.c' object='trader-help.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-help.obj -MD -MP -MF $(DEPDIR)/trader-help.Tpo -c -o trader-help.obj `if test -f 'help.c'; then $(CYGPATH_W) 'help.c'; else $(CYGPATH_W) '$(srcdir)/help.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-help.Tpo $(DEPDIR)/trader-help.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='help.c' object='trader-help.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-help.obj `if test -f 'help.c'; then $(CYGPATH_W) 'help.c'; else $(CYGPATH_W) '$(srcdir)/help.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-help.obj `if test -f 'help.c'; then $(CYGPATH_W) 'help.c'; else $(CYGPATH_W) '$(srcdir)/help.c'; fi` trader-intf.o: intf.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-intf.o -MD -MP -MF $(DEPDIR)/trader-intf.Tpo -c -o trader-intf.o `test -f 'intf.c' || echo '$(srcdir)/'`intf.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-intf.Tpo $(DEPDIR)/trader-intf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='intf.c' object='trader-intf.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-intf.o -MD -MP -MF $(DEPDIR)/trader-intf.Tpo -c -o trader-intf.o `test -f 'intf.c' || echo '$(srcdir)/'`intf.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-intf.Tpo $(DEPDIR)/trader-intf.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='intf.c' object='trader-intf.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-intf.o `test -f 'intf.c' || echo '$(srcdir)/'`intf.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-intf.o `test -f 'intf.c' || echo '$(srcdir)/'`intf.c trader-intf.obj: intf.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-intf.obj -MD -MP -MF $(DEPDIR)/trader-intf.Tpo -c -o trader-intf.obj `if test -f 'intf.c'; then $(CYGPATH_W) 'intf.c'; else $(CYGPATH_W) '$(srcdir)/intf.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-intf.Tpo $(DEPDIR)/trader-intf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='intf.c' object='trader-intf.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-intf.obj -MD -MP -MF $(DEPDIR)/trader-intf.Tpo -c -o trader-intf.obj `if test -f 'intf.c'; then $(CYGPATH_W) 'intf.c'; else $(CYGPATH_W) '$(srcdir)/intf.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-intf.Tpo $(DEPDIR)/trader-intf.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='intf.c' object='trader-intf.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-intf.obj `if test -f 'intf.c'; then $(CYGPATH_W) 'intf.c'; else $(CYGPATH_W) '$(srcdir)/intf.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-intf.obj `if test -f 'intf.c'; then $(CYGPATH_W) 'intf.c'; else $(CYGPATH_W) '$(srcdir)/intf.c'; fi` trader-utils.o: utils.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-utils.o -MD -MP -MF $(DEPDIR)/trader-utils.Tpo -c -o trader-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-utils.Tpo $(DEPDIR)/trader-utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utils.c' object='trader-utils.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-utils.o -MD -MP -MF $(DEPDIR)/trader-utils.Tpo -c -o trader-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-utils.Tpo $(DEPDIR)/trader-utils.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c' object='trader-utils.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c trader-utils.obj: utils.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-utils.obj -MD -MP -MF $(DEPDIR)/trader-utils.Tpo -c -o trader-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/trader-utils.Tpo $(DEPDIR)/trader-utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utils.c' object='trader-utils.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trader-utils.obj -MD -MP -MF $(DEPDIR)/trader-utils.Tpo -c -o trader-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/trader-utils.Tpo $(DEPDIR)/trader-utils.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c' object='trader-utils.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(trader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trader-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1179,15 +1252,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1196,6 +1265,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1338,18 +1422,19 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \ + distclean distclean-compile distclean-generic distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-binPROGRAMS install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. From 3aa70639200293b9bfe35a752bd4b3f198cbcd2b Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 24 May 2014 08:23:35 +1000 Subject: [PATCH 36/39] Update the build-aux files to those from Automake 1.14.1 --- build-aux/config.guess | 207 +++++++++------- build-aux/config.sub | 159 ++++++++----- build-aux/depcomp | 525 +++++++++++++++++++++++++++-------------- build-aux/install-sh | 35 +-- build-aux/missing | 457 ++++++++++++----------------------- 5 files changed, 731 insertions(+), 652 deletions(-) diff --git a/build-aux/config.guess b/build-aux/config.guess index 40eaed4..b79252d 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2011-05-11' +timestamp='2013-06-10' # 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 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -17,26 +15,22 @@ timestamp='2011-05-11' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,9 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -140,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -202,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -304,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -792,21 +809,26 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -852,15 +874,22 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -872,56 +901,54 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -940,54 +967,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1191,6 +1227,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1217,19 +1256,21 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1246,7 +1287,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1315,11 +1356,11 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -75,9 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -125,13 +116,17 @@ esac maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -154,7 +149,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -223,6 +218,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -247,20 +248,27 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -278,20 +286,21 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -300,7 +309,7 @@ case $basic_machine in | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -315,8 +324,7 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -329,7 +337,10 @@ case $basic_machine in strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -352,25 +363,30 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -388,19 +404,20 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -408,10 +425,11 @@ case $basic_machine in | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -711,7 +729,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -769,11 +786,15 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -808,10 +829,18 @@ case $basic_machine in ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i686-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -992,7 +1021,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1120,13 +1153,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1324,21 +1352,21 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1470,9 +1498,6 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1521,6 +1546,12 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; @@ -1548,9 +1579,6 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout @@ -1564,6 +1592,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff --git a/build-aux/depcomp b/build-aux/depcomp index df8eea7..4ebd5b3 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,9 +27,9 @@ scriptversion=2009-04-28.21; # UTC case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,11 +39,11 @@ as side-effects. Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,66 @@ EOF ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,18 +142,32 @@ if test "$depmode" = hp; then fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -114,8 +190,7 @@ gcc3) done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -123,13 +198,17 @@ gcc3) ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -137,31 +216,31 @@ gcc) fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -179,8 +258,7 @@ sgi) "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -188,43 +266,41 @@ sgi) if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -237,9 +313,7 @@ aix) "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -248,44 +322,100 @@ aix) do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -297,8 +427,8 @@ icc) sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -309,9 +439,8 @@ hp2) # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -322,8 +451,7 @@ hp2) "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -333,77 +461,107 @@ hp2) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; + +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; #nosideeffect) # This comment above is used by automake to tell side-effect @@ -422,7 +580,7 @@ dashmstdout) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,18 +600,18 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -503,12 +661,15 @@ makedepend) touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -525,7 +686,7 @@ cpp) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -544,10 +705,10 @@ cpp) esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -579,23 +740,23 @@ msvisualcpp) shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff --git a/build-aux/install-sh b/build-aux/install-sh index 6781b98..377bb86 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,6 +156,10 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,13 +202,17 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ fi for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ do echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -347,7 +354,7 @@ do if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in @@ -385,7 +392,7 @@ do case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ do for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff --git a/build-aux/missing b/build-aux/missing index 28055d2..db98974 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ scriptversion=2009-04-28.21; # UTC # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; + + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,272 +70,141 @@ Send bug reports to ." ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` +# Run the given program, remember its exit status. +"$@"; st=$? -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi + +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) From 71b3ec4c9229823ad6862dd07a74d8f1338febc9 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 24 May 2014 08:27:55 +1000 Subject: [PATCH 37/39] Regenerate all PO and GMO translation files Files are regenerated by running "make -C po update-po". --- po/da.gmo | Bin 0 -> 30370 bytes po/da.po | 2 +- po/de.gmo | Bin 31250 -> 31250 bytes po/de.po | 2 +- po/en@quot.gmo | Bin 29862 -> 29862 bytes po/en@quot.po | 194 ++++++++++++++++++++++++------------------------- po/en_AU.gmo | Bin 29903 -> 29903 bytes po/en_AU.po | 2 +- po/en_CA.gmo | Bin 29901 -> 29901 bytes po/en_CA.po | 2 +- po/en_GB.gmo | Bin 29900 -> 29900 bytes po/en_GB.po | 2 +- po/en_US.gmo | Bin 29889 -> 29889 bytes po/en_US.po | 2 +- po/eo.gmo | Bin 0 -> 30401 bytes po/eo.po | 2 +- po/fi.gmo | Bin 31074 -> 31074 bytes po/fi.po | 2 +- po/fr.gmo | Bin 31725 -> 31725 bytes po/fr.po | 2 +- po/hr.gmo | Bin 30579 -> 30579 bytes po/hr.po | 2 +- po/nb.gmo | Bin 0 -> 30086 bytes po/nb.po | 2 +- po/ru.gmo | Bin 39197 -> 39197 bytes po/ru.po | 2 +- po/trader.pot | 64 ++++++++-------- 27 files changed, 141 insertions(+), 141 deletions(-) create mode 100644 po/da.gmo create mode 100644 po/eo.gmo create mode 100644 po/nb.gmo diff --git a/po/da.gmo b/po/da.gmo new file mode 100644 index 0000000000000000000000000000000000000000..8b8ba892858657ce106408c2edbc97b9fcd4db00 GIT binary patch literal 30370 zcmdU%36x}4dEXy+SX2^bUo2ts#-=qr(sXGS2}v`frMqYAS$am(Gb4nohU%)<)iqsJ zuc@VbTFbB)$FVW1Sz;%~VUfUKVw->?o5e(9AlTSo2#alECqBd{afoBcNeDT1lHdRP z?tAsBr)MNZiceh9?f+ZuyX&{#d*@G|wc+g%zps#9Nc!lLqv(g85JiWdrl(Q#YtM|L z=YYQsJ`4OT_&o5Bz-NGe9iBgdm(S+@IiT{5@<&DN0-p{}1-t`%F82-ahrw5YF9Lrt z+AM%wxc%Ub;0X8{a0B>$@G9_Ez$?M8gUbKEK(*%z24y3-1Jv`A z;E#eGa1;3U@cfhE`5%Mo|KEaY*A*0U1$Z5({I`KBXBE`=yaQBuzX2-$AAwuI{~9oU zf!`ki_5I!882BDA2EPQ3g5L>vIfd-teiGacu7K+A2SL^MrGS48Ue5h9`11qc)d8;w zxFg{80e1zwCE#Sh{ooV%{t(EJMbn_>uNH7M;2S};>%HKM!LNffIrV5)*G@|36=pX?#E-T5B@Ot2@n#C{utE!|99{b@P%| z4{H8i4{H41397vJh4&8y{6@gP3b^4`r}xW2<=+zS4}vQH$H5nYoq%r*_>q8L2IDA- zz8mn_48HEK1w~&cLGe>H-1o!%Pk`dvw}Tqb4}xm9p1?eVYTtc(Jl~tZ7jXYep!n%Q z5YZKV0o1(w1*mpCaj(C>JYX5rcujz6*Gs_{gDDt;Zv!`i9|P5nuY)T8--Bx3_rYg? zm+bR?UJj}qH-h4`AI!u_Yf&D{SLxD|ZCVdtMIP~|oQ zz7y2<4}pl9=)2+h$Pw@Nv4E?f>U$6PMDUXVKOOK~z|RK!e84XR{9?c_2mC6idHV+V zQSdvU=;Z-~i||vR#`$ZY#`)5to_{MS`k4YXk1q$G2Hp#bPJRY_D)=sN417O$9r#rc z(upoT2Csp)f%YC$IbRLlmlvft^w8l17JeFv*2HH z|E*c)<1fD4_4l8Gm+|~ruki0*1U`%VtzZmJf;F%PR>04L8n3IlQGad$Z>RiwL6!5b z$-IM!{&%3{{&VZ(1#bjL$d`bk+t;6V`|d-a#^c+d#`TIt=YuIw9~B_28zB81+0R~e-AhUz5`UhJ^`vf-vlMsF73M99|2YFBzOh*3Q+ugFQ|6D zH@trcRC#{}(#+^dJ?EQCz^k~wEZkooaA&}q0^SO$-bwK3;9UV*;4`?tFWkQo{6X&D z1uFlC!~N&N`>%n|;`v_${C>d8`u_Yy0k;R-8}Ox|>Rkk%3El%f8+-%!WbobKrQioZ z)&EgY{X7@me-3;a_kRFB1^g!X9PnGbVNs2Hp&+{v}Z5 zy*Avx8GHiw&m&z!(r=n{j`R;mzfIClb?STZ9G}?lqx^k2>0gjekmgDHAtHi+%u6Mol&zeD=@aQ_PMr$}c>J4u=+{q~R=b`?ec z4E#{I7W@Y3O{5 z9!YfjTGHL5l=L7;W3J!r4kjzNa*dj^AL1tZeNxqLqk94h_L1IOxZlF{anf5z|C00& zNpr2=yGg%nSN=!5t{-e{a_$iLo*51gPTboBTa>88Hi@@C%ua_LYgF1 zNOzJ%_u22axR@aQlkniSfTsig0eFn`>!dqKHPR;1XGq&gbEH?2UQJpdB_#doq&L`= z+ch_EeJN>-^kUKx(#@p1NN*%Pg{0qyNv|SF=AI$_3hDEtKO}vbl>I&tE+hk=7Ovk4 zzJv4=q{~T?pT9@?SEQ>*+3#i91-OIso^by`@IKNnlG>yt()&o+@7K8a6zLYyKO%jF zbR+3Wr2QoQUPHQ<^ab7UE0H>+!=zoLw~@w4zeM^RDf=yO@lMiH!-Jm%M@cu4o~~zc zJW**ccKS=b>S{ch_B*{e=HX=8TB@{H<0DC@o^pblwwMH*K+-UJvZJSaby1k^?taRd;URqs@_nxUPRND3A{P!n1 zm0F`+w*j)Z)5%IcFe+_29n{P9o@CBz;d*AF(g_1JxEo)tG@6yUrq?xiKGp5^!w`h; zichSS$I?!3K5aHqYlyd;_O-i}YOj&D<3>9kY5IhmNPCrLe5%sydp#%mo%YUn_MVa2 z?0xq2?44I#bya-0!nEmK%-!r=yioxQm2NzjB<;ACR2d^$H5bSuo?DH33(4>h7Kf<( zm_y?|WP-KSBS* z4mJ#xdMBa()T%nWHVq4Dvjzdhv-gdZx6hA^%-$2H^END9O?bR)qt1LJmFhz5&(f84 zQY*IbyrHeG4#uuww7@{5?S%PirIc#rtdnJAQ&V#~$kQEU>Lm01Zc;1Jd@FKIuI^6e zn?ENytMMyFy7Ac9LegB?6wjv}&)H~m*{X=R$|cJRn{=QyxKTvXXf~5Nbhgr{^%izg zMzgxfv!(rJEpEgA)wB&S_ZYekY-BH!GrdkFPL~o$x2B3WdD&TMc^%!DL2NeKNjy@s zFS8u;jfCPK;Y+ov>&?o(SN|9g@%2TE%4c%DMy!2Vtf$S(MlG&O3by;LImWBd&+vAg z5y;;dKaY*Yn?|bH=!AD(t)^&ftW`NP)-%o?lz!2UWiJ;JL~us}!^E1yoout~62!QVkB;9ZGJgv7IcOwq7`LLPx?yvjarl1s+ufA%0Vsg*k zeftmGi`ZW3_wGGXSvpl|cB5_GUbMYki*|Hs(Y3vW=sMC%NY|5YAR(b{jSnD|;vQmS z3sM**y=`l0ou}8Y_wa`G9^P1r#^W}6+y(~&Cs%mtc2e6|nnLrm#k|ZjO0(IWy{{Z) zeV96U=I+ypX|yM4 zCvz#!W)>Pt$kJ}KC$$3GQdlzE8f}Db-%Nwe6u9mu;r)(>d7pjXY1At11}5T? z>_`ptzO>V>oY4~mOE=QwqoJUtOzF)fF(!$O-1$!0f_1x#W!W|Rkh2Jzog|Evb-!~4 zX6W*d_8`8hy%Zh&Xun*)IuW~sxLJ6^)kXUgByWZljYqKS(zcy zMZO!gtu(N?WghiA$d@jp{BSv$y=IoHkAbwNpgAN^x^j^WX8!ShYChgSeq^s$w7Zm4 z8)$Oq9-_`P?p)GakrlfQIjtdhu3RzPo|(lZ(>;~osk)iC8{Z^4GC zV98KEqC&ta@#qIN1h8U&HbU~W~GWILzrrv8xOm3{JU(L2kq zDpn~$H?tEhd0VyFY513MwcMGUQW1gpvqqyWQIym&+L(_knQyU~en6$AZt)TEwb zGZGZ?mO_hXC(e#jod$`^2`<$b=p*)~#KYCjE}p$^cDh`;-J8zvr`2k|)3wgzA{Cpk z2Vu~4ENDgo73K!L+b^-KdA^jNN2XHBpN{%U!=XG{obh#NQp@C?zVeTX?`b`s6+TdR zstMHCg)|w2MiGMUS`f`wRx>J*o$0B)Jd}iq<55&;1=(XPfxVP=dz)kAT*-MqvF~Rmf>dBeS4{K3 zux`Il61?2NhH<4B-Uo6Yh=Ov7zE@y`l}ZOyMXgowstZKyMGyaMF*#qH360^rMSSKP zkd-Tha_J;SS}GAz75n7^F~|}tnrXB-V01Bp;3mZ9`a=Ojifz@F&<>42kbW8gH6njw z0|28FuJVqXZzWPdAe-FHL@pD4Vu6CNjOnXM2rGy<2(zd$^X`;X5)!TorD3LZ7$tdH z_IV#!7b9-f1PONf!Z_+n$PBq@^0gqSVV{>k?J|%S&)&e`3@V@WF%E)vlghxFQ?Hwq zcCz#F7B@rur&gKt5|6Is-T~7N_ht{pV(QHvRGv5hrC zZ@LsI;;1n-<8`D~E|=rTB_g(c6;q5b+<;&Q45H_Sz>0~ZT*n&2WM)q}Ix12zgWjxD zCz=*w*ZBuYfr2xVnVq;u1kzNQG+;?(Nl)dbRiI30PbQR#YHdMU$y{9m(n1UkW;V1>uB z@a4v8sOe0%U#;ToXlCI?T2K=INnu;OdLXnj0Uf%8+&Ka38a4F0eIgXAsQ(&WoL2=% zupTrlcJI;x3}0`px@Z$ZUK?sFpqpZ~bV>*r^9IzIc=pi14}w2dWGPj;i&A2A&!xD; zy~u+akitO)HHc>}H)=G=OjDcIi(BgZE|Vb|gp$~QLFPRFWg zlezI>Y zZE_fuD#k*_C+qJtf2XFT&HA%Cd%{DCTEe8jI5uEs(gs zYb;6NKPYKp_1v|Eth6A-`TAs8S0z)>#kUEocZfxL_#YtDdIfSQa<;n zdz)Gf_%?|}eT}IL)u2u$2lnG6FDYYof_Q|;#3Bq*U}of-S3_BYR%DcBP6uR($zgg} zbS#r#r&}wbHD;R130UehWD{E-GCNlF5~Ir;ee=0c6L{6gdUsAFt@661Te9knm0tp=`tp)} zxj>~LWLrd7%uOlnpFSDyCt}>eH9pp#!|G!}9QRcL=1i&Wkh$oZ+3haXfotr|O`#6f zAgt5ZxatX&YLdO$Dl2^z`iiP2R4VVw1eme2_kj>$Y5Hh<`}pzW!wJX(sNOwumkaBpJw;u%cXq`eIC`zta?qiH*!#y znKg5AA%~Q~V-Hy^p52lAW&_{wk@$}u-U{9slFWZcY;=dlR8cB(rXRJJD7CP*DT7Al zfvCZwX~t)u>5H+5jJu!$D2Ep1A}hpcM)5xuq{V&cy$4%F6FbPwJaI)&HkXY0WP?e} zBNS&Rf+U=sMk0$W6*FkpWow8b3TnpqNAU(6995H*UI+$dv0V%e-a}=w)@IZA?9~j# zAT(qoNq}6IAb&C{gNa1?9?l6uh$i5}!L|9)m$H~u#Y1W#JY}AeBH0!du`<@lFoJ1f zZj@yRX8xey(#nF@W1CSX#-|S*KY8qg??t)L7YZxe`ZMc7a1Tvn$*dfm>>A@^A>MiP z*omp5(=lHDUGbe-BDkv*Nu4VYmHF#@N8?$fG7q+V{(GiM{C!W@UJ+tkc|Mc+7bwHt zUF7@VT)F3j3g0=H~t;>!}xe4WsU!7@s^8zLcS&5kmGZH`tKiOU{%rJ5e+*Bo83uVGBb9 zxxQy4TP`y%GM$|93vI2mSRHYD%dIFZf;@CRAM6AoLAEubDL>zXm|BK|2j^BxdE|D; zF=H|c;Y7rUTe1=~^syyrgsSyOO&~+sZyvr+r>$sdBs*!7O)!#Ad`JB=VQ(8jWtJx! zERm?^VP+&0O`9UgN`+9Y*Ur~d#6tr0dQifnt6J?U?wT4E;m9Qqf%eTMGshJHswc87 zj+xbj1jb>tSH*CcW^pLeHWV6TVQ60K2N<(iQ=qJjxe#-%wSAXewm;BJG7tI&&CT|w z${8$oXaVkm2Ibvin43k6{cr|CIU_@2m5VxS$+UVr?yW8ncY|+z9a{!xSd}u3ovFrL z&kkI)pgluOG*@UBR(iRr3tvtT7f!44cFW*NT1!1d(h~Ly+No$d@cr6m6w4Mv_;0ow zpS?=Dr%*5&X+oC177p`#S@5}7%up>C?$tUiA#=p8##sNcp_Ngdjt|Ah`@A_3Y4?kpX|FNtZ$4n*l|f@h~jo{(|&~s55$@| z={+30!d38iKv7WUulIydkY`aO#5Q^A{dSc+y2rO+<}ttO>gN3A`R@j=Lb-uNu?+H8 z$88IxiTp4d`74Ye=+eSwa}{D|CP{4{u(Is11`%h0YY-j9NT{{R-cPVKEYk*je%{u@ zyr8`V$XwEkSEUT{SL;@hzdhAp@yx_@k*D?gS~bwhRguHoyXL)n9_ME%Y+)I_tsm-< zu(lo+-VVKtDs$CZGGAY4oL+3U+Ue3O36Evlo%Zv!*|`xLRZ*)Orqk@|j-(saiEN+I z9>bmamde3qEu^Y%p0o{?>}2#UN0VU>gNoiTSq)G3B=ePivv*2cP&eGPD?FV}H%zy~ zHT7+{V>L2gX2ZBIk7|)qV%Bvx0Xcs=={u(_>`ycxd)g=Dq-9t1^7&6iQ-h}_e&yb3 zGelmlwou!!=TDBZB5V4`6$k~`FVtvnMUi=a-`;Fyfbx32dwnX$HypDN#d-b7-ygT7 zysVP*zYn_2*C5s@KfG@y^Xlr_?ODCbYgyP^H=3Jjiw+ zw4^j@(@=cHYz^`;6@?o%HFsoTltxEJ3Wd2=9^}jCqvUhErf#2(HD&l1vkb3Y@q?nm zV-5Y_p;5z{+pzcDt5PTgU5{L2`=V5JFU8ny5q)DEYUpSFg#DPc&C!|GT(_65RGF4n zXy@>mm1?J#w&r}C2Y0^R`B*1a%xG+?Hg<~9An36(Ry-VTy1sl}2}z4UA3M^mH)>-O zM7PIIq&wq-)nI}(oVfx>6eZjJuwE)*?#M>J;pKHw{E+3Z0mJn+pmqc-mr7~ zwO4Q3x^*iV$Btv2s_ZHeuN;FVDI$s~4ghdv@-AhC6RajYT0-Rd$ZA`RXFgwLDFv8nwS~6wN>gOInpj(6OzM_h}sh%M`pp|4L3vKiX7<%2WF&8x- zBWr6XKJSsZE15s{VDq#WVEN!b4#iL@^WBJbq(yC+skAimIC!maD(1N6a-Cx_GY!=o zcl3JbWDK1UCD{BeGTG3W20-LSNF+Xghzld=$1)yM3E^xEwikU<7-mq~Tmp~R`5&rg z%PDK+?9j(wlRMk5p@PrdkFmzS)N}W@vvVkeuanNB?v2_aiwzRM6^x8AEVqZPw19P+DH^CA|_I^3M;t&#}(A2bbfAK28M6 z7keN2kPUvJ@WT2qVK;r$OX@y+{rW1VKs}y=lSPu0)2u%9A=Ldk&dyL>tkl?N{;}68DbC6^Zk!GOny%*ujn)|!T!=;!E3(d%>03s8XxOqQiirk` z>RI1C>%;Zd-*aAyfEjz!OrmpS#s)5XCpptuFN4W)cq34UdYXNkwOq~Ce5)%>Gduhv zSZL_LO(DN>Ggv+3*eXQV+ZDI^u*yP0EBwICAhV8eJetBo{zY_;@$!Y6VFzU%P0>1e zv!>;Ni^3#6^zp3Bhpm2{3~On?RJP3wZmzst{?a8gA`o81V4zK=<>&N>a*Nv*(^^{+ zSQ_1@q=T;T(>RIGzw@xmPigi=oxWLg6{XWRPO?^dHX{Q=1m%nHMLlK|FgzIRX7t&) z_=%iyw7nedC`Z?pqwC7iOUlvp<>-cTIEix_&A!BrASBKftZ8^$hjC^nPMPJRabjDR zSyi@TLf3J_*uKLX4UNVSRTPXY>0?S@7f&w@T6wfB#abc8^q9{KwXx7yq-D%bOMjZ}740Rg&bcAcRL9Qs94ww3 zLV+a9NZ@#UX(pT-O6EJ*1@>{$i!f5`;81h`T}VN5oxYn1e)`9(rgaKdZq1%eF1>$b zUriM(?I5G`BR_U($W;b`n?hVg;ueKlnV;*RJ<+dODOkMtY_bkADnk+G<@ph!L4k?{ zg`$97_uKY+?$hWLK~5~ zj3Dbw+PmDd)R4FPm@x>M#e#%`6WEQV&;(AoCpt8~#j16YBg3ES?T`@z z!`MOY8?RhLGjf|K=I|@zP63>guoH^A%_=1oJ8b-b; zg3YGYjvCPu^J&zV!dW9_7EQDi$Pg(ea$o&B77f@kYqgdM4s`l8TQ&DOkkRDExEU)c zloK}Sp?;u?!PfPJjs9X)^nZ7e{YR$zL~6ydgM<)8sReGU$~t4g7q2hlX5%wGHZzUC z!K{c!U1?^YYEQm)E^d~bk-p1B2_C*k7M`#^$;@Ia8EZjq1WD}CGN&=fl(N+}#(Vr-4arq$ zBWu{Bqb;00@u17LJYEQ|79)T9RLzux#WX-Z6O*Ig-PN|oQk=JGG#aL4N0r!rW5yH> zk~}weO3pA}+JH&y1i^=dD$NApEOvKK|M3SnrK)I$p>1ishWx?z*!?+}JaB84tR^im^#TZ%Hz#rgIt*_ZJ zsTowTJ(>7wbAWsMp)Bbve&NMH4ln3b5_hgA7&p$$W2zhGzTglyMie%L)5G_ zZJP9$(*=(P$!HGIB9sEH^M6K3DzakJgO#`L!61EzhL#>Fgdv8$lX-aF@gQ@^jmGCI z9aM6IAQVv=ij(R{+QF(EgfVYo12zT8Eq0y>jia@ReIWj4njW>48RF#*Il~8L3*oD{CoUzId=jwBV@Bnp08|mMQ%h zB6&Ch%v9#W)Qk}Z(logJ z7bF=vB6lF^aFWTEr4df~Gq*S04Zz?=^RNVI#FSNo*_w@v`?J&jjkjjtjOzfC*}WWL z(g`NBnyJ)W1xU?2B)KHTx<%R^9F=R1CUtrqE6M97cDTki3xN5wS((Au9R76jMJ#psRu2Q zEIK|Y{l}%9TB4psY(0dw9DK+n5Pyeuw}zbceNH1mP>4HF7IXyPenAU;Tox+|7O$Zwf{OGi0i$6EE<{c-hVxUDXT5s5s27BH6g+wHWROy z#8wU2p{8IxxX8*Swz-oCw44&*Iytr>W|TQ88iss*&TUZ>u(ln`eJegPE4Z95(eO>- zJ(gNyd1|KbOHwar-n0%iO|ZzOwVwFS z6H|vzjUV104mD{(fU#%C*>cHZd`t98=ztNB)DI60A|Ipe`+(lj=YKyF-NmqSH>uR|QVY zZpQ+)(W84>U~*f25N(r;8xGzb@IkN$NuX*w>(pgQgMYS#-lFq$sR1cT;@FtjR#01L z-p{EfmiI7nB#Jd>I?JPAriNS7sA&*Q51()vtLyYOCi`C4fiq5B{_T}{0ua73hM|O( z(Vh==dpOSQs%))l%NBlejdx+KnCrq&68?k#{16rDZ_ovF=;MCS$p=RzW9t0fopU-A zAB}a+>12F7o}t5QPdPDlVO>67kMs4aOa+#*_$ta4s$e-mqK6H&#EiHqY^7y$*xL@m8+Y~6Pde@OeW+QeaB$3N&5QgC z6{qt}5UVIPe}1B%Cp@5-znZb|inSqACnn|dcKR77A~O;h9<0m6*WirPxT3}0Hw8zL z!0YV~Ri#!OvJhk5PH;(Jupc>lvu-{4+lhoN67}JLx?b8br%-5-ch|n72X)xnw5McQ zU~y$DY`7U6w~*veFAJ}S-#)^FPSeTh=wPLIv?Ug(+;0(tu8C%r0-$RwzlwCp<~%F z%VqzPV;Rw!PKZ9n7kk9k8G+0^*h!718f=9*v_3x-6t)VUe=f+3a2a0skM@S8XFs45G*RCBl6?`56PV~CJ#ZY?c zk8Xnj7fmSyF+8TB5cG!~)-l6?f00%HVwA;v@Upemke}G`J)FIv13O_D28VQXG-`0i JYui@+e*o=~|9=1g literal 0 HcmV?d00001 diff --git a/po/da.po b/po/da.po index 7747a8d..f32513c 100644 --- a/po/da.po +++ b/po/da.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" +"POT-Creation-Date: 2014-05-24 08:24+1000\n" "PO-Revision-Date: 2014-05-22 10:57+1000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" diff --git a/po/de.gmo b/po/de.gmo index 3a97f9fe82c72856b336e25d832121b36622932e..b51543dffe555e500a7a9664de838c795d2bbeeb 100644 GIT binary patch delta 51 zcmbRAg>ljs#tmG~jHZ*hot=42bPY^(jZ72_EUb)7CPzC<^FTz56buclOgA?ljs#tmG~j3$%0ot=4&bPY^(4J;K5jjc@0Cr3L=^T0$5%&iPIH#tu*0|0)e B4c7nw diff --git a/po/de.po b/po/de.po index 7635518..4787e5a 100644 --- a/po/de.po +++ b/po/de.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" +"POT-Creation-Date: 2014-05-24 08:24+1000\n" "PO-Revision-Date: 2014-05-22 10:57+1000\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" diff --git a/po/en@quot.gmo b/po/en@quot.gmo index fc8b7a8d9b752e777dd507263149ab3f919d14dc..e6f35287bd7e6eb296e8eae977fa22bbc6f477c1 100644 GIT binary patch delta 52 wcmZ4Xl5yEf#tmG~jHZ*hot=42bPY^(jZ72_EUb)7CPzC9c2+h70FGS^tpET3 delta 52 wcmZ4Xl5yEf#tmG~j3$%0ot=4&bPY^(4J;K5jjc@0Cr3L=ql#>9c2+h70FG@9vH$=8 diff --git a/po/en@quot.po b/po/en@quot.po index 09976c5..84faf25 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -1,7 +1,7 @@ # English translations for trader package. -# Copyright (C) 2012 John Zaitseff +# Copyright (C) 2014 John Zaitseff # This file is distributed under the same license as the trader package. -# Automatically generated, 2012. +# Automatically generated, 2014. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -27,10 +27,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.4\n" +"Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-05-09 13:57+1000\n" -"PO-Revision-Date: 2012-05-09 13:57+1000\n" +"POT-Creation-Date: 2014-05-24 08:24+1000\n" +"PO-Revision-Date: 2014-05-24 08:24+1000\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en@quot\n" @@ -1125,103 +1125,103 @@ msgstr[1] "" "%ls has issued\n" "^{%'ld^} more shares." -#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387 #, c-format msgid "%s: missing field on line %d" msgstr "%s: missing field on line %d" -#: src/fileio.c:60 -#, c-format -msgid "%s: illegal field on line %d: `%s'" -msgstr "%s: illegal field on line %d: ‘%s’" - -#: src/fileio.c:64 -#, c-format -msgid "%s: illegal value on line %d: `%s'" -msgstr "%s: illegal value on line %d: ‘%s’" - -#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 -#, c-format -msgid "%s: illegal value on line %d" -msgstr "%s: illegal value on line %d" - -#: src/fileio.c:103 -#, c-format -msgid "%s: illegal characters on line %d" -msgstr "%s: illegal characters on line %d" - -#: src/fileio.c:184 -#, c-format -msgid "%s: could not convert string" -msgstr "%s: could not convert string" - -#: src/fileio.c:255 -#, c-format -msgid " Game Not Found " -msgstr " Game Not Found " - -#: src/fileio.c:256 -#, c-format -msgid "Game %d has not been saved to disk." -msgstr "Game %d has not been saved to disk." - -#: src/fileio.c:263 -#, c-format -msgid " Game Not Loaded " -msgstr " Game Not Loaded " - -#: src/fileio.c:264 -#, c-format -msgid "" -"Game %d could not be loaded from disk.\n" -"\n" -"^{File %s: %s^}" -msgstr "" -"Game %d could not be loaded from disk.\n" -"\n" -"^{File %s: %s^}" - -#: src/fileio.c:316 -#, c-format -msgid "%s: missing header in game file" -msgstr "%s: missing header in game file" - -#: src/fileio.c:319 -#, c-format -msgid "%s: not a valid game file" -msgstr "%s: not a valid game file" - -#: src/fileio.c:322 src/fileio.c:329 -#, c-format -msgid "%s: missing subheader in game file" -msgstr "%s: missing subheader in game file" - -#: src/fileio.c:325 -#, c-format -msgid "%s: saved under a different version of Star Traders" -msgstr "%s: saved under a different version of Star Traders" - -#: src/fileio.c:332 -#, c-format -msgid "%s: saved under an incompatible character encoding" -msgstr "%s: saved under an incompatible character encoding" - -#: src/fileio.c:340 -#, c-format -msgid "%s: illegal or missing field on line %d" -msgstr "%s: illegal or missing field on line %d" - -#: src/fileio.c:384 +#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393 #, c-format msgid "%s: illegal field on line %d" msgstr "%s: illegal field on line %d" -#: src/fileio.c:466 src/fileio.c:487 +#: src/fileio.c:51 +#, c-format +msgid "%s: illegal field on line %d: `%s'" +msgstr "%s: illegal field on line %d: ‘%s’" + +#: src/fileio.c:55 +#, c-format +msgid "%s: illegal value on line %d: `%s'" +msgstr "%s: illegal value on line %d: ‘%s’" + +#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 +#, c-format +msgid "%s: illegal value on line %d" +msgstr "%s: illegal value on line %d" + +#: src/fileio.c:98 +#, c-format +msgid "%s: illegal characters on line %d" +msgstr "%s: illegal characters on line %d" + +#: src/fileio.c:183 +#, c-format +msgid "%s: could not convert string" +msgstr "%s: could not convert string" + +#: src/fileio.c:257 +#, c-format +msgid " Game Not Found " +msgstr " Game Not Found " + +#: src/fileio.c:258 +#, c-format +msgid "Game %d has not been saved to disk." +msgstr "Game %d has not been saved to disk." + +#: src/fileio.c:265 +#, c-format +msgid " Game Not Loaded " +msgstr " Game Not Loaded " + +#: src/fileio.c:266 +#, c-format +msgid "" +"Game %d could not be loaded from disk.\n" +"\n" +"^{File %s: %s^}" +msgstr "" +"Game %d could not be loaded from disk.\n" +"\n" +"^{File %s: %s^}" + +#: src/fileio.c:319 +#, c-format +msgid "%s: missing header in game file" +msgstr "%s: missing header in game file" + +#: src/fileio.c:322 +#, c-format +msgid "%s: not a valid game file" +msgstr "%s: not a valid game file" + +#: src/fileio.c:325 src/fileio.c:332 +#, c-format +msgid "%s: missing subheader in game file" +msgstr "%s: missing subheader in game file" + +#: src/fileio.c:328 +#, c-format +msgid "%s: saved under a different version of Star Traders" +msgstr "%s: saved under a different version of Star Traders" + +#: src/fileio.c:335 +#, c-format +msgid "%s: saved under an incompatible character encoding" +msgstr "%s: saved under an incompatible character encoding" + +#: src/fileio.c:343 +#, c-format +msgid "%s: illegal or missing field on line %d" +msgstr "%s: illegal or missing field on line %d" + +#: src/fileio.c:479 src/fileio.c:501 #, c-format msgid " Game Not Saved " msgstr " Game Not Saved " -#: src/fileio.c:467 +#: src/fileio.c:480 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1232,7 +1232,7 @@ msgstr "" "\n" "^{Directory %s: %s^}" -#: src/fileio.c:488 +#: src/fileio.c:502 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1644,31 +1644,31 @@ msgctxt "answer" msgid "No" msgstr "No" -#: src/utils.c:199 src/utils.c:220 +#: src/utils.c:378 src/utils.c:399 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:225 +#: src/utils.c:404 msgid ": " msgstr ": " -#: src/utils.c:238 +#: src/utils.c:417 #, c-format msgid "out of memory" msgstr "out of memory" -#: src/utils.c:571 +#: src/utils.c:1041 #, c-format msgid "xmbstowcs: `%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:611 +#: src/utils.c:1081 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:616 +#: src/utils.c:1086 #, c-format msgid "xwcrtomb: `%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/en_AU.gmo b/po/en_AU.gmo index e0748ec1ed4d09da6178e5d113313d9d0d047de6..77fd685df92bc3dfdd5cf2d1d0b67bc3e23c58a3 100644 GIT binary patch delta 51 zcmX^AlJWdY#tmG~jHZ*hot=42bPY^(jZ72_EUb)7CPzC<^FTz56buclOgA?<`x*iO Dkyj1v delta 51 zcmX^AlJWdY#tmG~j3$%0ot=4&bPY^(4J;K5jjc@0Cr3L=^T0$5%&iPIH#z$n0sxVR B4f6m1 diff --git a/po/en_AU.po b/po/en_AU.po index 2244512..4d447e8 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" +"POT-Creation-Date: 2014-05-24 08:24+1000\n" "PO-Revision-Date: 2014-05-22 10:57+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" diff --git a/po/en_CA.gmo b/po/en_CA.gmo index 6f8cd3236d0e56a334143a7834bdf85e7959fbcb..25bc3ffbfd93169d167770128242b122ee772e26 100644 GIT binary patch delta 52 zcmX^6lJV?I#tmG~jHZ*hot=42bPY^(jZ72_EUb)7CPzC=% Do#hT7 delta 52 zcmX^6lJV?I#tmG~j3$%0ot=4&bPY^(4J;K5jjc@0Cr3L=!$l0ttqjaJH#>V70sx*B B4kZ8p diff --git a/po/en_CA.po b/po/en_CA.po index 42a1022..359908f 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" +"POT-Creation-Date: 2014-05-24 08:24+1000\n" "PO-Revision-Date: 2014-05-22 10:58+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" diff --git a/po/en_GB.gmo b/po/en_GB.gmo index bb883674a47a7ef8546a84502d9f70cf7e0310b3..3bc861654f248fc385bfda42792e67d2259547c0 100644 GIT binary patch delta 52 zcmX@}lJU$-#tmG~jHZ*hot=42bPY^(jZ72_EUb)7CPzCV80sx(; B4j}*l diff --git a/po/en_GB.po b/po/en_GB.po index c97cc8e..0e83f0a 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" +"POT-Creation-Date: 2014-05-24 08:24+1000\n" "PO-Revision-Date: 2014-05-22 10:58+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" diff --git a/po/en_US.gmo b/po/en_US.gmo index 767afa0344112fb3747b75c47e9158dead4f72f3..6f834cb508673f184f821c8275cf0d0641277324 100644 GIT binary patch delta 52 zcmX^3lJVe6#tmG~jHZ*hot=42bPY^(jZ72_EUb)7CPzC\n" "Language-Team: English\n" diff --git a/po/eo.gmo b/po/eo.gmo new file mode 100644 index 0000000000000000000000000000000000000000..bf35e48d3d96dd3ae1892269ff936f93657c42a6 GIT binary patch literal 30401 zcmdU%Yj|B(dFOYEhsy!Vozehh8&E7KI*M;0iS1k@`5N1@uw^qzniICp*^;(&&fdzo zNS2+LQs@Asr3D5`J4s6kr2~Zm8PZY+m$nX5I_nu@2!8yEAUOJTy$yno zJSzyE3w{)QHuyR4`QX>VXM%t4-(SJU=kWYoQ2B=WM<3aF8D1QWG$bv~w^VjgW>hUe0+Vvp#a`3AlO%DDE)ONx=Z49~NAhN1ok_<9EPX%K@2 zgSWy|PXm7gWJ-gFK=IojgI^}!KZ4)j`SZM#96WRlvITw?l$`t%sCGP=&TG70;BmXh z+dz$b9aKM8LG|nBz!dtQ1E0q8b=&AG6EzOf#9)EJQaj!RewX(j1I33QzAgyHz%PLs z=jXn{@!J7V<+`Bc=D0&@m z0(=|zAnpAMD0*l2!b{+*CC1Bg*+dMwx@k?MB1i?Re zd=7)J=Ut%q>l7$?s{7}je|{Y(xqSzy@%#X&c0cOzOW=?3{9i!vx8Knl1(k2Fe?A5(|D7NzFSrMMIrwH!?f(d<@%RF${{9uHc7GF8JHH2N z{-1upwP!0RxgG;m?i8r+bD;R)b^iTZ{QGx<;_pYm*MSnA_W`d5HJ;ZT!X|?gpxX6| z;3n{45YZ1l0gizG4HUmW=dkO?HcGbJ#P~)`^6hF*>n)fy+K6pK-{=5s6eY*f68o_r!x)|&} z?)v=(Q2h3L9=`^v{I@~Td+HQ*fG-A_>R<+hWrE)VtKdI?PXohOI{vJJn)kinX7FxM z?R+h$_Wv6AX7J1jYY<;_(~cBF~#%9R%~>5~zNE9o!9m2b_og&dAZZzkyC;qTdgy zA5WZf{5TB0hCI z>Nm46rbT<`&nkDJyIB73w7fC$#Ig);0 z)!@UVcaZ*=q@TBw=$eh4o_|yS_#a%V-~#EF{qw8AH;~SgBx{-{{YV}X`wh7Tf6Mi+qhN5KKogQe#Yem_BaE9v)1e?Zb4>*v== z@3-IFKaz3%v`E*Hj*xzm^ls88N&0yc>EDrlmUInC`gE0)|A_DObDAU>)Xx_kto!$* zfAb1Zdh(^DHb-yr=eN%~=e6p`*E ziLdjYPw>k)>3;v>l^z#7{zq_%^ik67qy}jV=~2=S(hTVy(od0ANHIx2bEKcQ-<+M1 zj(sYrN_siz80luxU8J{=o{Y%mr(g#VOC;cbVmq_`~BmS2cflv3pzYTmR z>2;(lNiQM&2htyrt|sL_cjUi-J4x^H&mREqBRxP$NlT>nlJcLA@XM!3w~*dN`ZDQ8 z(!U@bBcXXsrR zjz{TYySLP>uZ9y@uiXtpUQT4Kr6^qukHzh|xNWcYr(J%VYDTNTWYmf~_WD55?sW6l zDteGl;bhhg4`jWxVR?#IN3*CAuX%SeS}wmjzU=F>La$2F)IT4}R>E#(H5t*vX{R?k zo79sy?S>OkXMTgX?YNP2!=p)yf7Q0b>O-d+H=9vAJlW0ai{bt=_4z2Bi`RdjZbywI zowEV5uaoggF)*Swnf2@C_kHneq&cU;pwQ^bM;L3+Uf4Fc5bLqyU$A3 z?!5ZytHYxa)244BPqn-FA_DVKC!C4nG;G9m#)wwUc=iZqR>SUmJUE2qAsYRG2~;Yz zb7ReB7vS8Z92U1Pe@B28lQ+woGg8fLw2ryHd97OorG z`f7jd65|C1B1>cDtCd03=xmT>XiHOb+RxMJXKKf@y-wVy(0n7gCRb-S^UXig?bYzr zL!Gc%osXMKTf*6_?Q$k5zqTSV*J#DEA|`FP4QUjUB+X_#2cNAZjqdzzXf*3vT(+#& zY=kNDU(Zrxxy#VC5hME;pXs)vFk6aY-G(aO;%Mj8iaI(WgV;>cI2>wN$vnqw5<~tn zKdN0F*Q~s}`p1Ast}jWdn8}SAvG!xRo|KPCBb<{KOna>v#;ep%|8;{AD886HSF7Qc zp?W?#{+p{-Q&g?CqBGU5Np_$5B|DaXoR3k#Z7B?E;%w54ZGiLdo!-pFvS?Bx@p#_9 zqHwlkt)|J0ci70{PP&D>%_cfKO2eo<*K47s-DDS;$(nS+s5O(!^|D@PPq>sZGc!pu z=_YY!w>2xzT&+F^$}V#|zNeQ+3tzMa)mMd&g{sS4Zt`GPX$AbWV0LVbZ_6vXL4nBa2X%4euthH-%h_{6^b2M!*(7qz|A>)v}T zS~?vyJHhr&H`tLjf}QO~u&X;CTt|8Z>3Y%)BsA2m;UTnA*hOuOpoKBg+qYFVczgXu zFK^iB<&BkKEKITEHaIvqg~3y|!{OVG96dI9eCm}a zPEOyOr0R~`lw;X)+$l2o56*>xk%O^jH%jDhMD3Mmm1lJNYSs%oy>@&{cxUb0?X~-^ zt(}{!-FH_QjK{bqb1}+$Bs|(}1QXGc+?DV^J5J{2@pQ6aU!2A>8ShTcCrjwkPOvXC zf~gFa+_oe|>GsSu=&Y+@AL41bmYgqVr7l^*xqfApMx(da?yJ_$-Ka*Rk!t7mPE4OT zdh_0in=wgPoqCkk<0g~n3VT%ubD~y$E2WxM30hedqW2o|kVYjVMiU5trmgYM>8f?KC>0Hz<})pvlKV z!A-f*n~6hQ5;?iE?W~39b{0qF*Bn64qHK1Pa8@=f=LDFcD+=vHebu`eHu|xa+_*Y1 zyOg+jc!Sji2V*pJf_qmF4#n+yuW3xu5WmUuZi%hT5$T}cjoVfdd~Uf%y*B!#11o>O zoXlP`&(*_0T0>|C4V0~1B7?bqd_O!J9vnNiUn1IBit7oM9KMICbBj9@cUR=aZimks z;f*6UC-yr|i7{41Y$z|FJ0Eq8$3|Hm^yzAt3fd$1FcF>%^ids>1Ljn%=&r!%wp2pS zL+l*R8ZK%(>e3*XR1R}1T9WUarA_@qhI@MC8__q*uqsihz&Ew=mR4Jh+9dMJxLWR9 zPl<$Q{=CsxOAIBo3@5W;l&>we(hs<_5}%1$OHJx2HzUR%kCa+m8$Ulrbs8jo9p_gy z2L1?LQ^LV&Ym4Wvt4)qpUget3@MraUuidfE6e<;;unS|*bv$TB0u$yOdgs4{^5!Y2 zbsm{28UM7^R~ioI(c)aLeUn4xv}2~HY#88*C~R8unfy7;c<6s>%+=!g?ZElbu+}+$wfl{S z{&W9zZL(a@Wm3L6Lk}Sj8d-Z9FNm!x*r(Yq?|xGuD3yV!bU!jqYA-YAX0>xE1{ht_ zSPJeaTGVg6>vUe_#ywQiiovO6=dUT~&@;zFrIxt1Vdl*!F)zr{9LoerQm%M#TE$lA zjaHKKDQCILQaf8>g^Vz;BtdkPD{2vcU_ox{FZsKA$@(oX1mBEx!WC2!36?8jEVHtw|oGrD4y2Z43|3zU%M1Rus3MgQHidtVid zR_J?#Agn}fOck}(C96&$;xD@J&xq;y@=Rz9XD#A0o4{7iAdFT{;iP3!A$5sgp%A?; zG15$<%>ko}6NEIOJ~ti;1X5zFw)l2v1ibds2&fUo7aITsop6=wxUH?k3MgdLySd6` z!l&mUgl9}&O+y$V;vmeT#>{o6B1&kuI-G`^)@GEn(z4<`bX|zLRTHGx=?mkilCT+i z)AVaeQ6oODfZOFDEuO!D!Rc2%;l|i2-YuemH>X}Vqcq`hTl~{H6+>6e7rb;=FR5Y}rd|D}J!UoIT5MyD(wnRVia2Ua&3PSajE;_mfzyci z_H|q_!f<_t?F)$BmjWxMjtU!V0+YKvqrq{piaGS=ojRszp?018peZnL#xk|>OGF^e zl*s~CL`!z6aIHLN!h3R|M5;A{wvxN#{7j=>j>c&o%w4KF(I^$N7+}O}dH7n!YN+WpHK2vP2}+1(E+-9|WUeWT z4RghOu+XNQ(yTN45m}}Sbx&9}!67y8m3FoX-7?4MIU9>goXYcYO4DMS))74Ku5_WM zfI>_W>R7#$Pp+BNcws_}uiI|ClC&bVr`jy5o15J4biA%X(!!!YNK&S`(=GqYTq>r) z=Akye;sX5MjA~dJf3;p!X>AKXt#v3-*jP^fS;6KL_8;ylTp3;XA`dOeU+E;`1;+$r zV{yW~_)QezxspOA)XE}5Lk*VRq7%1m+d&Z&o@H_6X_LdaR52DZo`~hRvA#uX%*kgD z_YQS##(VM~^0#Ez_=A6YGFsM9l-2x6r;R0PiWW%S-&OTkgbD}+@OxioEpXsUieB!j zv2OORn*6l2K19KJ)-%U=XoYA7E~%KKB%v`!p`~?izV0~FjZ=%~naJfeIA0Kcou2P? zOi{>rkZr}wAkLt*A_|9)p!R1NG3%l8FPI0! z_kWYe@c+?$K=KFrmUpYvE7yYls)Q_$r^`^e-79-r1bD|15oMk3J+{F`ai2vB9?=e! zT=&js<)r32f0QP}d^3NY6$_3te?6Q?cm*Lvo#$4{%{}Jcrd9*KU20LKadqJu%*jOG zf1KbWG-~6-Bg7^aVUPhcC*M{z(CW7$=QLY%z?QfiW{1VcatU@jZ^gI9TvIIqmfDGY zV(UZh$EsdpbooNx)?AngR@LZww>XiuD(aSP$*VU}Le$IpX5b+l9_nmGH&iCFrPa2D z0fr~^VkEpRn@__#BE0r^b{4KL(~$YNEUh&n`%K4V0UT_?`q*3td3~WleHDcM^I;oqhmZ(-Ab&W1mv(grYo^xdTr)# zD;=_>3VsZ0;Fel4%Wh=Y$!5E(*hB(u;Vo8x82(I8t7NxbASx)?77-R(rc@42o(c~V zF>bRop6bou^|2w&@>K!m+^Fr8yXY*l^Se|BOJmpE4DMhL!a9AeGd;diO|q-D&Q4!M zUorKBO11hj1!m&x`ap=VGI>0F)!2y>W0TXjp+r zZy`#OKU}n7w(YSdM9G{a(sX`1R-0sT&O~T8Gs7d-c5&~eEOEY9E-@M z3od|jXi=fEe4J*O^~b!dxEp%cgAwt>PI5C({6#N6V@it$YM*y z4AMFI8WM<-nKAiMynzLds>!LBfs;bUAyKGXUap<&-HQQj}E+{y_Z;1|(U zr;@HMIAywW@5!mLiTyXLxy5>u z{nSf+Mo{;Tk4+r$CFQ7SgwVaq2?r9~mNPVJ<7M|k`T#~A^f1Jb8?TJy%jNDxZj*C) zp{-Gi-4W++IWG#2pa@;hdOv|kkR6R^YMt+bnA(Oz24_|)MdWs1Va8;X!ilI6=gCUZ z(8rdv5vJBfYCId#ep}(Y>9id!jbuA(atKEHiE`9`(w}W3sLb|c!WM~o?q^0y(X1(& ztWpZay4opyn0SciUKf;b(N*nsl}}9#i*d9h_ks4U6?4ZG0h){DTTGePga&58YM;vC zFwNpXq-`KH#>UXB_78Ao^QORAxp1N8oYi)x?DF%0=90OfueaPBe~QlFxx))c7d)ud zEsnW)#P|4yWIhGK-y?#=_3_muTL4`j}{8 z&@OKD3RCAxP7V^MRYkky@Wid9E-GmW{{`z*b{#0cwi#vG5(xKG>xAd8mhCAK#v+Z& z)7QpfkuMKEm&pv&a`9em&=N8SoN5g99|u|)<;n0!cp^L%PKDFFu`ji|0&mpp(8od# zLG!zu2#zUyJM2;Mu?mc{^FKLvNm$QG7j}uz6-`x-8TByh{xz^IoiW^99I5Od)atS|3vo7;of zfWH6UjAzx=wdKb*O$?6E#WUz6F)BspaBakW3&%H26(-MZB$J`FSf7Uv{E9}o4V8#FtK835%tyt|@tV5bbgZG_#+Yq*or>?1@~<`Y{g=iKYaadC zcUP4{A=rBK8pju9s=FD^c8lm6zi(84ZFSyFOPa09ox3=s&2ckx?@+k?S|buc3rc5+qP|Fte(I- zRb^}Q?cj9e?(1%J`EWp@9%Iriwy>L)UL>^@Is%NjW;lKk=s zJDNr1CwX}E0X8LkZjKNVV56$_&)TqJ#WK^>3W2^&mh#eR7PM{%$5eWO(4@Uuu)OxJ zDshUMj_g^qr=!izVs4=5K4UTh0 z{iTEka&U|mHA6GHBLj=M>lZ&D4V@Of@W!OKpv~{-!o!S(qsS5?rA-U01>N5MT%r?F z%MmQP)aI-cyqe!Lc^ukslx=tVl`;FUEJx&QJ)E%Ea=e5fi%%EImtn-Mp4G6>8H$Dh zyznM?g7vG;(7KOV-b^>pQ1&CpWs^X&=y)ZWBi2KBk9jD^dHx1F{8Mic2wQ2^gP#GM2>9x(S0qY$r8J=nvZBuSmeG)bB5Tl<6+G z8es;z7=wVZU8{zaGlh#B`ph0<7FXkXTG68)g1BiTRKWKq>}ULv?OUH`uy($4=9rghUk`@;7WKpCrfhe3Ys(V zS%y`|H}Hac=4hmLKc-xR>c?U^A5fdNmr=(1jb**1D=OtnGE%2RDM~>E>7TU6=3j#S z@e~-}nKn8HCFmQl(5K^W%6LNi6z&j-1~1qgPn;4GBjv={vRv#!jMFcBKku2|lPoD%_# z>A5Z}WoP*t16eq%YS_|uUZj>WI#RfQ@ho9;U9)kG!f2qgY1v4r18f24T8f5^U+tES zYgXPI)N7?wH8s2aV=6eJj&PnL%od}w8Z>yRzZ`==?w%Hlg=o=urWvtgg3AmIRuhn* zjpeeXmJkzCp``p>Th(f{nvf5V?+47-;VehIh*RB7=qU4trxel)iFBsz5KVF7n1`hU zCo624`z@DGEo1z{d98+ct{ni;VTF7S=U}sZVpxIrvFgwH+RYDUxPOGL*aq>N8$Za! z8snIvC1KG(S#2Z(9w-cpf~67)nFC0xfcM_1f}EtKZzV#L=H=GpfA9BErYTAS7o<{~eF4x$qH zN+Sp+*`1(LevuQa+UO>FjO;Znk3Y=Q%{1->_7$6$<9P!68YO*7b6MN}+u zL>I)~44s+JytHXDLRthaT=z}%O=@F~aa*Ugb=x*V)`q+iW&%B&Pk?3xO{AqO;zZa# zpAu-{b!m4_S8IydPz*p5M<-0Qo2r0rusG#NOEDB0+hQ#8n%DNcEcG;&F_J=~*c^AE z)M*-J8@US0q~St5plfO1G}?(`%I|35anS8N<$UNc0v$%K5+Cg|CCq~cYz)0a9RYp#*IeL{7N-e6ddF9W-S`4=<^Kp!Ikjq75FsUk)9D#^f;A&Jn=x z%P-)#{Z_kxV{yQ|vCOPaBAOrtE<`AnbWG&qLN10Vu`lnM?EWz6N_hNT90I5bszu!=icjyO^n2*z7EOdx4quJYH(BI@g?*(b!FQ?qQ`=ok{fJlgys zt2&Qof!hVfWo?tm%N#Mc*f^+DX=S#}aWUy)#**Hzxu9eG67g4k_-ye>({2*rr#PH3Q!HM{xrIx7gHTP(lg2F08+ z7jN}sXGKpZX?bo#fC(}}wsPVyD+ZcTDY|L~sM5t7WkHeP7cz~GH)QsUIn5U)ULw;0 z_gxBG)j7XRQ&Ag-vE6=z6J(96H;_~>A74Hwt-xkrBwc6RSuN&p*qlE*vqvzv0txLL za7xjZ-d4BUJrIxA4zWK8cNiaKNS%F${c`F}MFhlni#=}W9MhR(f_w`Xy`y8+0->}& zWu$RrK;4OFqs)d_JE>gcl8!G+2UAHL_d%Nq1Vgc*>m9&ag`}<{%HfsCwJ9c8ecYcedQZGN`fD3T#T-bR0t~GuzqpzJYOfw7{tvDwBPvLgH-h zKjyVlwCm!}GVRP9P6qk?q7F{aC)Xsx_HSKH=!&wA9C#?M86C-%@C_A4zN~9TuCB{b zwggFVA89Cm63KT-ZUkFLwjyTnCX?Yd*%xrZyn88Y;~Yz8F!@q;E%n)XkzCMWH<7Pc z8~F{`aT^xdWS-t+w!l<9H(AVr>cOrVVZmkJm>wzXyhY7~KU~MSy0=kV@hoz>=Hgc1 zT%jDa3{yQg6%A_17Q}}<#9xC4l?0t z;K~~Pj)>mLdde=!@?NXFu5va|<*KOu#ki?~DB1v>>9w5_F~T#wv@*GW@-X+I#&iei z@Nsdy>Svt%suwwOjl@@UooU9H+dZP+;dmYU0;PVW)=N$@nBb|_w8E@h=5 zQD(d1deYH+bKR6Pd-ud7QUndjkgMhhYEnlPH5Y3jys(bb1Nz&TXZgb&a%YQsN;1MY zTwMvAg-Io#Xf53wge<@5z7npiMyo|z`Aa7(SIP@6hHi=xw@REAl8-@$`Rh1IJZp;! ziLx^+3%1gUTRmx$wBkY|@^|||Q9n11h_nm4*!}gLSAa};@5;l0x|e8jXFwzk;ZWQx4{6#UP!S4HHqVr6 zu~A80)46i8Z41*@l-d9=AKN5tgA6#@ez~dIwE8ebIzYVASB~zl>)M5;0=Y;rp_Ty5(65Vk?Y_9DGuSJ13Q zI=b#VI@308-QSJ%Hl>u!*_w+|ai1?v#2to770x#1*jCFoO&SPA@(+%vH9m zTy#?A#cY|?6MD2E<%$;bHoEHCCMtQwc8^DP*L1kM=ERh{6+N=VnLjx+sV2Z(bAp_r z0;c4-<0Mj^3tYqCTjK@0z=V>u`%TBwo2}pZhFh55aJpy)$@Jb6`=?JFpBj7g{=7T` z1{d>s%Uu$~@=oKuB z&NFh3QZYT$1+iqJ%`AdB37aZ%D(ld_w%C^bW z8DH5e&rwd@6d^PW8q&+ZZT_G!5fv4rC1Wl`A+m1aWh%q@3)UgIMlsvl(ynZ_6(Mr} zBIgzDeopX*RJ2Q>a;2EJO4{K#YZ%HIjjgSZn9EKsMy^nZ>V<}1p68MOJc?fCT5qh& zG0pt6Vr3kPPGl5LOY1tvmkXMdhcUPXa@3eL2Sr_2PM1koXY!|qb;QhcE7Bz1hLaE= zKUZ2J%PlEif1>@zT{sWEV^76;u1(Kk7h^E|?#$iVn?CvG*#G<0CwHp~1JrN0_Ewf7 zbh_PqQrKx^jV)f=j6qxMmW+cJpKL@#*sQMN$7@KINv!SbWAz0#y!mvTdrxCDZSBpc z3lC#=^DWCU zv{?R;n}^cp!LJ)12-CIqfxnhK83(t;1NWaeZ0FWqwz9P2wM+wil-i-#CigM+H3Dun zO{T$Z3tVJ6;v-XXw+PwBu z#2&{Yx9x00>5h$x$eJ${4(uk1qr%rIksN5!iDIwQ5eS1ZXJL#_*t&&=f5TZyE#TC; zfu_5P^{Rh1+=vDHo3b0K(Cx-UtGG0zC%wh7NP_@2}2im8ylm6-eJNEvr z&>?>iy)tY=v#{01DIc6*O0{P07LPYm{Q;<05l^T;2rjqla3voCKL8a!0Deq8coNK( vUFfNrGr>hZP6)#}&b8ojQyR1RgdN9i*X5ppJ3TfO{aZY`JJo-3r?vktk1nwe literal 0 HcmV?d00001 diff --git a/po/eo.po b/po/eo.po index 2c3fea5..193a45f 100644 --- a/po/eo.po +++ b/po/eo.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" +"POT-Creation-Date: 2014-05-24 08:24+1000\n" "PO-Revision-Date: 2014-05-22 10:59+1000\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" diff --git a/po/fi.gmo b/po/fi.gmo index 6cec326a81d37ce73bb1eb14b9bfe2668faff4be..7b2c9f7c5ee6227faa23f505736c9eb7e3488b66 100644 GIT binary patch delta 52 zcmaF#iSf}V#tmG~jHZ*hot=42bPY^(jZ72_EUb)7CPzC\n" "Language-Team: Finnish \n" diff --git a/po/fr.gmo b/po/fr.gmo index 1747384476bf348c63ed21d4132bfd56101ded33..b5117b9b6d1afc8bbfa7eecb556418c9b683217f 100644 GIT binary patch delta 52 zcmaF+o$>8=#tmG~jHZ*hot=42bPY^(jZ72_EUb)7CPzC8=#tmG~j3$%0ot=4&bPY^(4J;K5jjc@0Cr3L=!$l0ttqe>zH#=up006LB B4yFJA diff --git a/po/fr.po b/po/fr.po index 38d667a..36b5f54 100644 --- a/po/fr.po +++ b/po/fr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" +"POT-Creation-Date: 2014-05-24 08:24+1000\n" "PO-Revision-Date: 2014-05-22 11:00+1000\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" diff --git a/po/hr.gmo b/po/hr.gmo index e98242d06d91a7d62403085d35a271a02320115a..26f2fb0eb65da277673f2fec432e9bba5b23c936 100644 GIT binary patch delta 52 zcmezTj`8z5#tmG~jHZ*hot=42bPY^(jZ72_EUb)7CPzCzH#>hY1^}=` B4\n" "Language-Team: Croatian \n" diff --git a/po/nb.gmo b/po/nb.gmo new file mode 100644 index 0000000000000000000000000000000000000000..f569f857e96f1de9ec3ee1cc3e8cba1d4bfa62f9 GIT binary patch literal 30086 zcmdU%37lP5ecvyM0_0)9fZ4YzU~I|OJZtkN%gfAYv82&x(2PWE;RpA^u+&;&z*8@9w^r!*AW07=uN>GDZGB?)QT&;^=)fB$ptGK*xp zxcM{#N56OPJ^T6Z=N$i=CvJLcz~47X&mw*NkwNhEM+Cv-WA!!&e&Y#2a0&QP@QL6T zz^8!U0WSu>=ifhqk5A(H5>WZJ@Q(+zYnUuAE%M0f=>X|udN_m2yO)Ve=yBI8b=dUJ+A=O&o_Zj2j2tU41Nl{3;ZGY zZtxB&Q@Ll+xr5+!;0X8%a1;2e;N{?l!Arq!fy)2CLG|aEOv+|(7pV6qz~_Mj@G|hN z{{5%@`#%6R{vU$s*E6Z)nc!8R^1l#NJu9H*=WU?s`z=uUzXNUq|Jq~tH1~WIRQWr= zQSd!r2!0*h0{)f9XHdy5o+rSa;4-N3eh5^1U-$Su@EJT`%s)R4Ug7adkGnix^Rf)?0N)4h1%Dqr06vMr8t-kO#`y-19|2X**TBbte*#_u{v~)Fco~be8;ro` zgKq;X;BSNK$LGPV;J*SjkADk>;K*}aI|sm5^E{_#2s0p%e)jH+iZmc41DCZZk>do1p07+o1U5zx(f-Z*+XR z7gW8sfy%c6s@&VbXM>*tA+g{OK&}7ZfIkU7i@}RdE(OJpJ3y_&OFRxit>5cF&Hpcf zs_%XN`~4oj?eQ->Zo1jg`!hi0-{zkWgR1|<;B&!&$2WVt*W)+9FbIPG;_*pLzMgl3 zqOTL6_^IKahyMAMp!oK!pyu;Kp!)rJkKX{F%JUzCqQ~!p&jBAb?#f*XK85G&{qu29 z{5B7&z9mre^d?Z{KMSfqzvrL-2z=KgSZDBJ-oJ65o8NbW>eq)r@zZBP&BHf6{wI%r z3o74}_q*?xgL=LhRJjvi2)01=^R=Mp=iQ+C`5938z6Pp){}xm~{tDDO{MZ4Jw!BMaVBI1JAgDg$(Igp~kV~@G{ zIR$E*uk`p1P;~SO@NwW*z^lRUfQZ20;%SG6K&|V~fEDlq;N!uMftufQpyvO(pw|16 z7rOP{1-_2w+d%21{|HJiJ@TaM|Lbmb{P#{!^ZgM}m9s!@r z^VFOhZx4I|`Q8GGPTt>g_T87kD$kYE&K|f9)b}|MkrccJyb1g&DE@d1oj|n(Tfr;9 z7lV5LbKn8+{UAdP{@lMm*m3h2gNJ$l25^~vd>h=%^Ymg6{1i9==Pw;8mM_1`tNTAMIRpn z>1Oa9km(Hm2o#_FiGQvn?)_suUhMHn;M2+X6i{+?JE;C1@Xs}mDJVL9EvSCJ-9O*! zzyB_HG4H?S@y|T|50919@yj#8Cz5Z}Ki>?Bo{#(II;eJ1@R8sv!N-8F1)l`I4b=EP z3JK!kCWa+`d!lfB(1gn z-c9Dm zMEBX>Z}VfE^pE|E7kWJH@t=d!q>qwrB{fNsPoF1=FY2V1k$#%AOo~bRn>2}f^Nsl7w?<1s_lYWYHhV)_5mr4JE^bJz>_bLBFGWD_k_nX1D zkzPr921#=8tE4ZHE+=Jww`D)TU8MK;=MRB*lioq_7ZX*3d(l<%h zk$!@7kfgs?knSS=Gd=KEAq_~Ar0YpVYJN;uIU4$?5>y_8?mooEG^in?)PuMe~aNt(S@ z(Sv*nr}}Alpg-(2El>VxvL7|$HScDkrShv|OTIlT^rBX;=bvxsFNbO0TCz$H^^)P- zT&vNFducckB?}w89mLI68cw#l{Hwkl(ioC7?sTF-IFt4p?Qs8@#zNGakJo>n9YoDm zZ{8-zzD~u<`NXKUseaKezxTy;*9yO97NUWlpyFw4DQb11ddIa@yg!sALq7$+T=|Xl za=JfA=lY#i-#X%YPXBsI)JR+XUfAk|BOSLOv;8#cgeRlU(6uu=9Q5{twL3?ewY#l! z?bPL$Umi|IEStWCJk@UJiz--%lCU1fy|5WKm?L^s_v8`QSHg55UOk27DXRX+6;vv< zJI6YmFiMg*RbQ53*O@eG(GYX|YVGcarSVzDCw8!Dh~@_| zGE%!U?9bV>BwFxr$!4APh@-|r=-&00dvUYe!*x^J zSSjYNWwgLV^m{Su)$LQO)w4mCk;^(-(;`n&WE#YC!z6B2=)P6CCRehD_2!@1!Akhj zkt7@)U5Go2mxXivfy>$I@v|F=xT+P)3Y!d|Hn>ql(&}{LdFX7p)l3)mP)Db6nakE6 zcA8-i{%`bq@N&x34PYbt7@tW8QP^LMA>F1LzRcB~)t0xBgiK_v(7e<5mVHYv&7CX;O)>aZm-Fj<&*dHd>hl_ny zrrzqb(pH@8v2JCVM@Jt*%`WpGe%Y`kDSX}@jJ_y*D7CuWPl?1mLT4sLg-QPM%4TX+8EJ%uba>j5zRCG2jCn1=>53R< zI)3K;U=TM_i2(S%MAE|^@B8z;)*Xn$Y&~qH-S9X3Zc9)Js#jb-Ha@X$|AB+I+=bX) z9Hw_2jTTQvog~S;JKQ;znR;v~=HKR6Q#LJr0{Y1ERv5e=536`qmlEB#@Z3-NjuMu}xL|530LI~HjnrPgv3K=GO9a-sqFKzX(U?LM!c{NGg zfkwpwr)sA%BefH!sHNKN%%Q7sHx+JJ#DCxQ0N=CngH|)@wJ;GEWk+hF5A+AU=#1VV zSdu`CkA{MpGNo6KLrfAGxpRYl7uHSMRoOKMkh2JzJtT~k4a+$OX6o`n`w(A^w2zK{ zs3kXUPQ)%DZWi9^=7NJU61s(X*9dNj2aRFJh@>fcljYqNS(zb{Am5GJmRs1|GLMD> zeR7MdKohp01+TaVLa zS+P5y^JaM6Hd_<>jZtERRS_A=3P=~C)M%`Vdr;J?Y0B%~h7A*8$xuI{LwvxRsu$@p zgl?`9d>*3bFxD_p2T@9gAW|93-Dpv^bHCToKV*2>kbK+p%`&WrRVvU;ZM-XQt67_Z zf0?UcI_qmZ|idR!YnJ4SPw zBz}(bQ=Nf6Lf4gWb+fhh*{f<()yj)p*O~r)qcI#LHke$bViTqi21Cb!W+qT!&Y*Yp zODJoelJfJ&RO$22Kx3ujP#!(b_}X`=YjRJeT%q!JdQY)Z0S%`SLyZZf$t1KAR7ccF z7y85bg%CHei!o2PkeldF(G12qBr%9tp0Z+qDx$Ds-DmOVwc?@wtFcz?vpayZ)v%VF zz1;ocp?EG{*QUw^T_)vgF!faAK{IPl<9TK43Kn%1<=rn8qNXyilm+jfT21=1LDlHo21Fx+#Jhi`dR>D!O^4=k=5sVooPi1>nYoT}A-FTC z`pZj6m@wReDvgjm#uC^|{UqHQBIhcO_hTzx8~0Ly6_B_K?Ml>#@x>LT{=PDB`F&HRE-pS*=#X zz)3`G`v#^MVYq@|3kK2qQeefzQLbZ+VKTF)8XOa;m_cvWsUw;$V%PBxk^%*1BvTu| zKm^iMnKWQUbxBXc&n%v`D@eQZ<++(@~p7^T?@ zi;JCBL%~QH3{(9yrV4bP1+H@Dve1zPMMoi2!byc0?`=WcR`nK6m&G*Sm$^|Nnq?)a z5~JlehvBVmK-)stM6c+4t65Qo@*E>V5M(X_MyFKBVt^5^W#P+>)l@T>WY}on>}X}- zMtV>Y|4Ct6yt)wDnSk~~Lhj7Mx<(DdWJrW!1@+%#h;wQH36?^`V)uj|VEDS;YKXQV zgSf32R3RKM4LP$5Rw12$44(HC`B4b@}n^sUjO&6VJoMYNJVm_wr{w-KGmLNDH`a>0x| zAX5sLTE%FvR7L5B3$13>7>Ii(BgZX(!mi~K$~QXN>yI}29oEMEHTw#u5fWe~^;WCq zYZ1{YKH|-`A~1Nv)QO{%CX#L=EEv~_Tf|5PyqIZOF(Y^@a|*Rit78gOWT7S5D@jYV z;D~^1I47)&-$WsvD=uU~tt>n=(!}*vJ@LS{9TY*~SsGWCHaUz+6=Nae@mPi%{w-2t zUN(EUcO&bt}-jZSC5B}{;w4|vhi}@KRjm2q-7D(LRKI$<^2KkBz972NHpJB#qgwDQT9X!p1Xi@C*38zfg>U95Hyk2buP?_AD z!e}pk$zu3_XgE2>n?GzUzlGBKG zsARe))yj<4JA0HQLw&P;$+88ASx>{zu+j4pHZ&F4Z*;8i2*opT~-mA5V3k~MFv1gn?j&8mlR%Sf^n*-)A2FRlzM z46tQFFSdn;`wPABwg{^|o|}W}%XLV7JSeHPP5POENd@%lr-`*yN{Yy|5Z0lM%`XjM z9&DE(V`d4^$DQ0V^VXQ&JG-lkaj>#YPEUWJI6jP8CytKtRCCL*f)Z4R-Z5E;7Sn4} zhg%ttxhmK(_`qHDWRBg)FzL^wcx z#)_&ZR4VVw1eme28v`N2%G9y&MPtX0k4??qibdl5bfag}zL=OA2Nczbmak`e-BkJB zI;|JeN(a7LO(zSQR&5aM$+W~Q(_rR~QLCt~Bd(E&BUUzYw-u@e$|_Q45(nNwBlJIh zwhJqX|1irk*@RWXl)AToQ2SCW*>`Oi_dB{D8e!%#I{`20Z&o0QL_K& zf~T|v$hsraruJNvDC|Id*)6m4W|S z0w{+b1Z3>AjvQ*5V zH!oX53{g@u#y^TT;NYm4toBkcD2wf4Xz(2>leJdshi9)~DvHpMkt6|fS%UnNQ5j4m z(s$t;FNEjCgw(225;sU6<3xQTsw9c zWqfSv$ng`?v+gX)`AR6PZ2Qmb3&A~fku9@oa3V3r$3i@HY)+{ROZ1}*MDcJ#NT)N;}t%}mFF|5f1Wz*+Xc#d=gN6b$N=v|)0|4W zzLfJg=gk}%o#e=e5H+2UMWmOzXZ7~9_eL<&qVUTLEeMsOrjsO<%p2Nlqsg+H!DK!GracN*=jg<(RP;rEnr*#96WuG>ow; zX@shEks42i^xr&ux16@4rI{S`I~;0_d~LOZ|G z%T=8(IkmcSdX@KE22b2wOc6jYEPZVp z=J~SVbGe#Tt(<>U8}x+C0jC;6{f`5!%<@!tBs?CT2&cnY-q@Gg?SWTncIe~u5JvO6 zoG^|Fd^_w>@v#b&v$H=rcS%^^7^gUKNo0uX_U_Pmg>e^%HFMI9u=s?l;Nk&gL79Kv z=R-j*iy|R*$Wz~Us^%^G+%e2N=GR!+ntxpXt@z~Y^(2aAkbgREM<`9?`_;%lVGKc+ z7B;I##Li5T+Bsll*<~Ff&H~pUI?9ny>yv#S=V(}_4Jf|u=wV*begb4p(u-H64DwGK zHj#fl*<$m|#B`ab^?A2CX!WYf)!e)0yYoEOXDJSGYq8_jrb zexY@`-RbuFi!UQQmK}FGNNKZk0}iU9RyR%cvtPHyNia`j`;5*Q7DpV5!&*pHcX-kc zSaOol9XXotXBbrVriq4syDy%LhMn}Jj-YP3;d=jes=sNf=YP}QrdwA6^JO-Tx$RMH za!SlP-AzEweVuS8r!DMHG$4CBB;=%RSM>7wx1y=yt%+Z`w>k`w*Q+DcHtqSFW9-P9 z{&5O~3hd9fXkSHe}+-nu$VjO&rFEytQV+#ItFuT$|wRsOZ6zIbWWu;$U9eRoYM z6oRftu5o-(sygjsYy{dwwMWBx!P3Bw8(Q%^NqqF@z;o)i)wYvEZ z!UFxld^H+YrjN~z!gF@sdUT(0%+BpQc8_kqYINuBaQn4;cJ97n$M)^p$vAo(>r{=c z&9^h$v18Bn?Jl2=_m3hWdkJBkKD48N86L-2HJs^p>cepFX?t;VqNgg`DK}Oov8{&q zQlqnR)Md#1!E!v`!gU(&x4RK@xVN?A+TLideshPgQ#`0@x4JrP^{c&pQF>3N_#+(f$6!>Yni0 zI-4rfogtB|QGy{|R;jmWkI4-?IX!GYZ`jfcH{THM*m`{>z*cRyS8F$lhB<%M-TR96*{Iavz1ACsnN+?rn$3-smj` zeJL-$C1*Rs)V)0Ew!Wez-#a4Zn}Ywxf<5J5);L9=kDvAcEhrKuo-t>D8X9F zZPVQq)$X-JJZQG;`M5mG4Q{_cKE#vbaG>w2Zon{zc+l>gdq2BU47|gLcM~$4UqLs|hjlng#6tz0#{HkPOl|SM zV|vEN=p|faq(S1AA#U?fTyat3_kYr#llS#nLz+FzK4^NRX$6O!{*riPE@m;-fAwY8 zeYNh<#Hu>5;~65tV_rdT=I4TS+Jc_H$@QOCx9NLk0+U^4P3}gc&aS*{^bKono+VN_ zCVKU3x#qob`Gkmz&d zVFRWLt3V?_zH0zlaPh1=J8Ffp`!5_8S(96NnJ^J>x&qN%A9jb@4dCR(z+HgJYu1g5 zbv4swR{5H$eRk9WGZ ztH0&4?!CL`vhKCJ>9X!McU|_g*;;6H=l~WlV<_ERnZo2@c6sT;A`ka9m;Jl2>#< z(FE3 zMP$Z_%hk7Cme4g)2$@9@p1ZF{DI+_oXrDfJ-=bZ1d4P;;>C6}TFlAQPBNOfdpS{)R zY(U+K!RZTUrVmX{ie>2@T8i@kU6F`USQk>_aYxvnw;L~_Vty91gjAH#KG?(5 zPC0SV#-l;P)yBD=jO_(SB!r7w6{tO{&K0DdB~2i?u{Aj{Z`rx*vY?4zc5=6ZqkRWh zGUO)_Y$QEhsQ4~$^E%c==Fr-$$IXGKxy4egcS}7gubGeTgt!ZlsD^RLe6OETOVCx1_vyNoNvc}V>Vp)A{zIS-) zZhrILE-o%mKb6Q@XT0WxGpUqYVgrTiX0)XlMncMCMA}zcnkPpnn71+nO(SGYX}v@V zIv^rfqnRuYd+n4}4*j3bf&J)52mY>ZyCC%2ZNL4Fx9(}ISf~xwe(kmdqb&}XR!mX96ITO4)jq3E`8R=oXNaYHQb+j_M;U$Bj!2*PYhENJGyjhw_jY%+AhJaYT4y| zd{zuBt9fn3UOt#8P$!((W`>QdvW%Al%pU9zm>3@!EvC_y_gR z8OIN)j-M_pG{?@Vd8E3oc5IQ80(1ot!o3&v6zPoT@XXF~0+AsysxEG;X)Ker<(ZJ6 zbQ7U@z$VLBTh3d?soC&t^!YL}JDeIPmv&%VgEkrg=fO#%OzKv{eP&FYyH8rI&B4ST zK}ve0&f8o$CmV5CA$X}(W7RAm&pQk2^i3XYJB#XMm zdav4-x3HuxzGSKq)7}|a75Er3$*nN%@XBB^TeB2@lkjjePv;aS^FcE?2$Cumr;K|Q zHd_!YM!r&#W<#~pAtDy@;V2P59gk8ti*FgnW$`6MwTjeZ7hFxbAZ8Yq=bAtL>9@!u zk=`}qsj#@j3T`wuTlfJe*v;WSpSjy=%J1hU3`Yi}h*!6;A zO#qbHz_y`aX9ac7e=$dMf>Rmjp-Heph655zwq-g{N7mhf>4^lQ9;Zk(kBp0~&bZ^*sH94O z)!l#5VrGgk#*X7uhzrL`5)wkrVzO4J<_Mc6$xK+k+FD)qaRv&RJCjoZZm3`$+nwIh z4SH{r*No>kJM)*px%ERYcRCXI)Z%+Wuchla7vj_vd0CB0nIF7qI}FX+$jd>+1wA+` zi@C4V#$EJZW-Ew%!>=sa|X~t zrZR4AJ|OVgEt9q|bXW%u(L~lnoq#fHr+o;nyqrY2p7*|sD9cA)P&Mj9B&$G;cyhpC z-0-@K(WEKB1q)HEDI+U$-Gvw9qdKmAIOi^OiO#9WbT#v3!4hww7Gc5S$_u0NJnG2T zG@ZNeG9zs%HFwW!&S#eg(F1`4N z;?~Pdd(c|4P=fZCs8(VTSN=G@u68vjhx4rP6AP1_TrNK93nmzgrLYIq9tWn#M;UkN z<(L*kq};*4v1-IFgRF7{f>nEgO*=y057^wp*w&;1dTUhDNo2g&6c6o^&be268Il>4 z)La-+T3&BXA|cK2F;;<}_#$mkkF^JH6vYBp8c~&{;9T6iTz_#s^WMd4myD4xg#@vA zwGPmay)-Hnzp7bpz^Qfwjc?j4C(&*lapFhmtRhtxo9JViINRSvtNl3giiwd-TgbtmnCbBDa00PV$h>Z5+aTsl)Af(aQ$;#C~Tbj}lwz+BD5{EeV zPF|R^8k`f!1yV(9h=VJ@gGNDciFk|F#S2-~s9?Yn{~=|{0(R9ye#Hl8iu1^cqSN7n zy5z&y9;Be&M*j)vox6vd6dGj3#JUQb@s#;$-tWVO@iyCeEKpuMBUAd{c4qyqyk-SD zGG~;98bBn{udX$m_Hc`-T7Kz*&ptCk{0*P3>&<~dOD?zW{46POrl}=lX}4_@D)X0Z zSc*0#6)s$*6+Y1Y9%<=a-bQ9aRdFa7!ziP}{s^nAaj4^j6=;*;UFoxznl=)!?J)>} zli!*GIfqC?NYlom{|bkCuCd5gJv4Q2{}lhB9$oi25TH-s#F7x)98?On?rWmJ;J4c zWnnel@9{Eu3!KuX+m0`F@R473y~j^AW-k9R5B}2(@w{z7*c23jMi+t1Wk|8(Kp>fl zQT1?@JY<4(W+R(c_W=qy*i+ihK*l(Y0P9NYdp}z;Or(_uIG40H|NsB(o?Ip9?xIMH zIo0(Z=!f{?L(~J(6;o>pt&Pp)&n|PNlA8!jZYI~A?yilCVCanTK_)z%^3LoAnb_vR znzDDKL3o27T=FTR8oKA>RDj#EL7bSqP#bsh*>3veGLm`7Vz}~9y+n2@1sAkpE?i+L z=sJWinbpdys9*TCD|i49 zSZOQJ*|H`gEi^4*Wj>`D)Ky=_+V7av-d_xI|E8!_|0xP<#P0kYIW~3V#PJz_F}Q*_DrRZTeX_P1{W2sgq-q2mPfV+aclBkJtTPlKUekrt}a9&MwHLJf{LQ zgV}u_=RM`QSRrB%8&=>xvEJt^FDYmdw9F-A3|7c$x36-Si-TR6B+h~ctIoC1?V>`j za;T8Vn~!;zwzXy#_=* zc0Nq%Cfx7_khoz3KXF4xF+7^v9+{_Kp*;PyK_Zg;zL7iqVUY=Ze6Lq=Ni1wZNL%cz zQrdJQBvJB7wI9HLIF%E{nly!By}jF%PlM+2B<0pl;f!oSQ8wA^X*G1)2O|MB+^vRV zE|Nh16y~9jTMP*U6N zx+=jABHT+{}APme4(dYDRZGKJ+@c#cXq4iNO&yN zt)3I%@oTXtyrpsyyGi0n#-7MmDn$oN+2Vl9OGipMdsW=- znY6HTcJP){rJVY(Yd=SH5FnH6Is)OjACKFtT=nXTRi$oo2?3wa1zPhD=W8O*Fdir7dzN^ZGkMf&w|Nc_b0IG8S@r_2OUH1w zjJfdis?n6bulf8SFYipnt>AD}zOIuU6Sd=@@pw}K$7b?rAsM(4vLE?y8cr<@!3u){~uqUb(H`B literal 0 HcmV?d00001 diff --git a/po/nb.po b/po/nb.po index 08cbbf8..c9e685e 100644 --- a/po/nb.po +++ b/po/nb.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" +"POT-Creation-Date: 2014-05-24 08:24+1000\n" "PO-Revision-Date: 2014-05-22 11:00+1000\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" diff --git a/po/ru.gmo b/po/ru.gmo index 39447cebae720b7e8ed0811240783a41746d6cd7..568c1f1c0214245058bdf7aef2fe0fdd71529729 100644 GIT binary patch delta 52 zcmbQciD~X8rVU)qjHZ*hot=42bPY^(jZ72_EUb)7CPzCzH#^S?1ps#W B4a)!k diff --git a/po/ru.po b/po/ru.po index 8748392..b8ca9bb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" +"POT-Creation-Date: 2014-05-24 08:24+1000\n" "PO-Revision-Date: 2014-05-22 11:01+1000\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" diff --git a/po/trader.pot b/po/trader.pot index 57b0b64..691322c 100644 --- a/po/trader.pot +++ b/po/trader.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: trader 7.4\n" +"Project-Id-Version: trader 7.5\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-05-09 13:57+1000\n" +"POT-Creation-Date: 2014-05-24 08:24+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1042,52 +1042,57 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387 #, c-format msgid "%s: missing field on line %d" msgstr "" -#: src/fileio.c:60 +#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393 +#, c-format +msgid "%s: illegal field on line %d" +msgstr "" + +#: src/fileio.c:51 #, c-format msgid "%s: illegal field on line %d: `%s'" msgstr "" -#: src/fileio.c:64 +#: src/fileio.c:55 #, c-format msgid "%s: illegal value on line %d: `%s'" msgstr "" -#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 +#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 #, c-format msgid "%s: illegal value on line %d" msgstr "" -#: src/fileio.c:103 +#: src/fileio.c:98 #, c-format msgid "%s: illegal characters on line %d" msgstr "" -#: src/fileio.c:184 +#: src/fileio.c:183 #, c-format msgid "%s: could not convert string" msgstr "" -#: src/fileio.c:255 +#: src/fileio.c:257 #, c-format msgid " Game Not Found " msgstr "" -#: src/fileio.c:256 +#: src/fileio.c:258 #, c-format msgid "Game %d has not been saved to disk." msgstr "" -#: src/fileio.c:263 +#: src/fileio.c:265 #, c-format msgid " Game Not Loaded " msgstr "" -#: src/fileio.c:264 +#: src/fileio.c:266 #, c-format msgid "" "Game %d could not be loaded from disk.\n" @@ -1095,47 +1100,42 @@ msgid "" "^{File %s: %s^}" msgstr "" -#: src/fileio.c:316 +#: src/fileio.c:319 #, c-format msgid "%s: missing header in game file" msgstr "" -#: src/fileio.c:319 +#: src/fileio.c:322 #, c-format msgid "%s: not a valid game file" msgstr "" -#: src/fileio.c:322 src/fileio.c:329 +#: src/fileio.c:325 src/fileio.c:332 #, c-format msgid "%s: missing subheader in game file" msgstr "" -#: src/fileio.c:325 +#: src/fileio.c:328 #, c-format msgid "%s: saved under a different version of Star Traders" msgstr "" -#: src/fileio.c:332 +#: src/fileio.c:335 #, c-format msgid "%s: saved under an incompatible character encoding" msgstr "" -#: src/fileio.c:340 +#: src/fileio.c:343 #, c-format msgid "%s: illegal or missing field on line %d" msgstr "" -#: src/fileio.c:384 -#, c-format -msgid "%s: illegal field on line %d" -msgstr "" - -#: src/fileio.c:466 src/fileio.c:487 +#: src/fileio.c:479 src/fileio.c:501 #, c-format msgid " Game Not Saved " msgstr "" -#: src/fileio.c:467 +#: src/fileio.c:480 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1143,7 +1143,7 @@ msgid "" "^{Directory %s: %s^}" msgstr "" -#: src/fileio.c:488 +#: src/fileio.c:502 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1459,31 +1459,31 @@ msgctxt "answer" msgid "No" msgstr "" -#: src/utils.c:199 src/utils.c:220 +#: src/utils.c:378 src/utils.c:399 #, c-format msgid "%s: " msgstr "" -#: src/utils.c:225 +#: src/utils.c:404 msgid ": " msgstr "" -#: src/utils.c:238 +#: src/utils.c:417 #, c-format msgid "out of memory" msgstr "" -#: src/utils.c:571 +#: src/utils.c:1041 #, c-format msgid "xmbstowcs: `%s'" msgstr "" -#: src/utils.c:611 +#: src/utils.c:1081 #, c-format msgid "xwcrtomb: NUL" msgstr "" -#: src/utils.c:616 +#: src/utils.c:1086 #, c-format msgid "xwcrtomb: `%lc'" msgstr "" From bb89127d3e64695d7f4a84a419cdc9dde436be09 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 24 May 2014 08:30:50 +1000 Subject: [PATCH 38/39] Include header files generated during ./configure Include iconv_open-*.h header files so that users will not need to have GPerf installed. --- lib/iconv_open-aix.h | 256 +++++++++++++++++++++++++++++++++ lib/iconv_open-hpux.h | 299 +++++++++++++++++++++++++++++++++++++++ lib/iconv_open-irix.h | 199 ++++++++++++++++++++++++++ lib/iconv_open-osf.h | 278 ++++++++++++++++++++++++++++++++++++ lib/iconv_open-solaris.h | 190 +++++++++++++++++++++++++ 5 files changed, 1222 insertions(+) create mode 100644 lib/iconv_open-aix.h create mode 100644 lib/iconv_open-hpux.h create mode 100644 lib/iconv_open-irix.h create mode 100644 lib/iconv_open-osf.h create mode 100644 lib/iconv_open-solaris.h diff --git a/lib/iconv_open-aix.h b/lib/iconv_open-aix.h new file mode 100644 index 0000000..129e030 --- /dev/null +++ b/lib/iconv_open-aix.h @@ -0,0 +1,256 @@ +/* ANSI-C code produced by gperf version 3.0.4 */ +/* Command-line: gperf -m 10 ./iconv_open-aix.gperf */ +/* Computed positions: -k'4,$' */ + +#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ + && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ + && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ + && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ + && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ + && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ + && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ + && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ + && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ + && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ + && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ + && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ + && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ + && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ + && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ + && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ + && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ + && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ + && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ + && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ + && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ + && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ + && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) +/* The character set is not based on ISO-646. */ +#error "gperf generated tables don't work with this execution character set. Please report a bug to ." +#endif + +#line 1 "./iconv_open-aix.gperf" +struct mapping { int standard_name; const char vendor_name[10 + 1]; }; + +#define TOTAL_KEYWORDS 32 +#define MIN_WORD_LENGTH 4 +#define MAX_WORD_LENGTH 11 +#define MIN_HASH_VALUE 6 +#define MAX_HASH_VALUE 44 +/* maximum key range = 39, duplicates = 0 */ + +#ifdef __GNUC__ +__inline +#else +#ifdef __cplusplus +inline +#endif +#endif +static unsigned int +mapping_hash (register const char *str, register unsigned int len) +{ + static const unsigned char asso_values[] = + { + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 0, 4, 25, + 0, 11, 24, 9, 17, 3, 14, 21, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 3, 45, 1, 45, 45, 45, 45, 0, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45 + }; + return len + asso_values[(unsigned char)str[3]+2] + asso_values[(unsigned char)str[len - 1]]; +} + +struct stringpool_t + { + char stringpool_str6[sizeof("EUC-TW")]; + char stringpool_str7[sizeof("EUC-KR")]; + char stringpool_str8[sizeof("CP852")]; + char stringpool_str9[sizeof("EUC-JP")]; + char stringpool_str10[sizeof("ISO-8859-2")]; + char stringpool_str11[sizeof("CP857")]; + char stringpool_str12[sizeof("CP850")]; + char stringpool_str13[sizeof("ISO-8859-7")]; + char stringpool_str14[sizeof("CP932")]; + char stringpool_str15[sizeof("GB2312")]; + char stringpool_str16[sizeof("BIG5")]; + char stringpool_str17[sizeof("CP437")]; + char stringpool_str19[sizeof("ISO-8859-5")]; + char stringpool_str20[sizeof("ISO-8859-15")]; + char stringpool_str21[sizeof("ISO-8859-3")]; + char stringpool_str22[sizeof("ISO-8859-13")]; + char stringpool_str23[sizeof("CP1046")]; + char stringpool_str24[sizeof("ISO-8859-8")]; + char stringpool_str25[sizeof("CP856")]; + char stringpool_str26[sizeof("CP1125")]; + char stringpool_str27[sizeof("ISO-8859-6")]; + char stringpool_str28[sizeof("CP865")]; + char stringpool_str29[sizeof("CP922")]; + char stringpool_str30[sizeof("CP1252")]; + char stringpool_str31[sizeof("ISO-8859-9")]; + char stringpool_str33[sizeof("CP943")]; + char stringpool_str34[sizeof("ISO-8859-4")]; + char stringpool_str35[sizeof("ISO-8859-1")]; + char stringpool_str38[sizeof("CP1129")]; + char stringpool_str40[sizeof("CP869")]; + char stringpool_str41[sizeof("CP1124")]; + char stringpool_str44[sizeof("CP861")]; + }; +static const struct stringpool_t stringpool_contents = + { + "EUC-TW", + "EUC-KR", + "CP852", + "EUC-JP", + "ISO-8859-2", + "CP857", + "CP850", + "ISO-8859-7", + "CP932", + "GB2312", + "BIG5", + "CP437", + "ISO-8859-5", + "ISO-8859-15", + "ISO-8859-3", + "ISO-8859-13", + "CP1046", + "ISO-8859-8", + "CP856", + "CP1125", + "ISO-8859-6", + "CP865", + "CP922", + "CP1252", + "ISO-8859-9", + "CP943", + "ISO-8859-4", + "ISO-8859-1", + "CP1129", + "CP869", + "CP1124", + "CP861" + }; +#define stringpool ((const char *) &stringpool_contents) + +static const struct mapping mappings[] = + { + {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, +#line 43 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "IBM-eucTW"}, +#line 42 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, "IBM-eucKR"}, +#line 25 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, "IBM-852"}, +#line 41 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, "IBM-eucJP"}, +#line 14 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "ISO8859-2"}, +#line 27 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "IBM-857"}, +#line 24 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "IBM-850"}, +#line 19 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "ISO8859-7"}, +#line 33 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "IBM-932"}, +#line 40 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "IBM-eucCN"}, +#line 44 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "big5"}, +#line 23 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "IBM-437"}, + {-1}, +#line 17 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "ISO8859-5"}, +#line 22 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, "ISO8859-15"}, +#line 15 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, "ISO8859-3"}, +#line 31 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, "IBM-921"}, +#line 35 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, "IBM-1046"}, +#line 20 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, "ISO8859-8"}, +#line 26 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, "IBM-856"}, +#line 37 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, "IBM-1125"}, +#line 18 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, "ISO8859-6"}, +#line 29 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, "IBM-865"}, +#line 32 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, "IBM-922"}, +#line 39 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, "IBM-1252"}, +#line 21 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, "ISO8859-9"}, + {-1}, +#line 34 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, "IBM-943"}, +#line 16 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, "ISO8859-4"}, +#line 13 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, "ISO8859-1"}, + {-1}, {-1}, +#line 38 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, "IBM-1129"}, + {-1}, +#line 30 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, "IBM-869"}, +#line 36 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, "IBM-1124"}, + {-1}, {-1}, +#line 28 "./iconv_open-aix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, "IBM-861"} + }; + +#ifdef __GNUC__ +__inline +#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ +__attribute__ ((__gnu_inline__)) +#endif +#endif +const struct mapping * +mapping_lookup (register const char *str, register unsigned int len) +{ + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + register int key = mapping_hash (str, len); + + if (key <= MAX_HASH_VALUE && key >= 0) + { + register int o = mappings[key].standard_name; + if (o >= 0) + { + register const char *s = o + stringpool; + + if (*str == *s && !strcmp (str + 1, s + 1)) + return &mappings[key]; + } + } + } + return 0; +} diff --git a/lib/iconv_open-hpux.h b/lib/iconv_open-hpux.h new file mode 100644 index 0000000..3bcff76 --- /dev/null +++ b/lib/iconv_open-hpux.h @@ -0,0 +1,299 @@ +/* ANSI-C code produced by gperf version 3.0.4 */ +/* Command-line: gperf -m 10 ./iconv_open-hpux.gperf */ +/* Computed positions: -k'4,$' */ + +#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ + && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ + && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ + && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ + && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ + && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ + && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ + && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ + && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ + && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ + && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ + && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ + && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ + && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ + && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ + && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ + && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ + && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ + && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ + && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ + && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ + && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ + && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) +/* The character set is not based on ISO-646. */ +#error "gperf generated tables don't work with this execution character set. Please report a bug to ." +#endif + +#line 1 "./iconv_open-hpux.gperf" +struct mapping { int standard_name; const char vendor_name[9 + 1]; }; + +#define TOTAL_KEYWORDS 44 +#define MIN_WORD_LENGTH 4 +#define MAX_WORD_LENGTH 11 +#define MIN_HASH_VALUE 6 +#define MAX_HASH_VALUE 49 +/* maximum key range = 44, duplicates = 0 */ + +#ifdef __GNUC__ +__inline +#else +#ifdef __cplusplus +inline +#endif +#endif +static unsigned int +mapping_hash (register const char *str, register unsigned int len) +{ + static const unsigned char asso_values[] = + { + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 1, 2, + 24, 43, 5, 10, 0, 13, 32, 3, 19, 18, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 5, + 50, 50, 50, 50, 14, 5, 0, 50, 50, 0, + 27, 50, 12, 14, 50, 50, 0, 5, 2, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50 + }; + return len + asso_values[(unsigned char)str[3]+4] + asso_values[(unsigned char)str[len - 1]]; +} + +struct stringpool_t + { + char stringpool_str6[sizeof("CP1256")]; + char stringpool_str7[sizeof("CP1250")]; + char stringpool_str8[sizeof("CP1251")]; + char stringpool_str9[sizeof("CP850")]; + char stringpool_str10[sizeof("TIS-620")]; + char stringpool_str11[sizeof("CP1254")]; + char stringpool_str12[sizeof("ISO-8859-6")]; + char stringpool_str13[sizeof("EUC-TW")]; + char stringpool_str14[sizeof("ISO-8859-1")]; + char stringpool_str15[sizeof("ISO-8859-9")]; + char stringpool_str16[sizeof("CP1255")]; + char stringpool_str17[sizeof("BIG5")]; + char stringpool_str18[sizeof("CP855")]; + char stringpool_str19[sizeof("CP1257")]; + char stringpool_str20[sizeof("EUC-KR")]; + char stringpool_str21[sizeof("CP857")]; + char stringpool_str22[sizeof("ISO-8859-5")]; + char stringpool_str23[sizeof("ISO-8859-15")]; + char stringpool_str24[sizeof("CP866")]; + char stringpool_str25[sizeof("ISO-8859-7")]; + char stringpool_str26[sizeof("CP861")]; + char stringpool_str27[sizeof("CP869")]; + char stringpool_str28[sizeof("CP874")]; + char stringpool_str29[sizeof("CP864")]; + char stringpool_str30[sizeof("CP1252")]; + char stringpool_str31[sizeof("CP437")]; + char stringpool_str32[sizeof("CP852")]; + char stringpool_str33[sizeof("CP775")]; + char stringpool_str34[sizeof("CP865")]; + char stringpool_str35[sizeof("EUC-JP")]; + char stringpool_str36[sizeof("ISO-8859-2")]; + char stringpool_str37[sizeof("SHIFT_JIS")]; + char stringpool_str38[sizeof("CP1258")]; + char stringpool_str39[sizeof("UTF-8")]; + char stringpool_str40[sizeof("HP-KANA8")]; + char stringpool_str41[sizeof("HP-ROMAN8")]; + char stringpool_str42[sizeof("HP-HEBREW8")]; + char stringpool_str43[sizeof("GB2312")]; + char stringpool_str44[sizeof("ISO-8859-8")]; + char stringpool_str45[sizeof("HP-TURKISH8")]; + char stringpool_str46[sizeof("HP-GREEK8")]; + char stringpool_str47[sizeof("HP-ARABIC8")]; + char stringpool_str48[sizeof("CP862")]; + char stringpool_str49[sizeof("CP1253")]; + }; +static const struct stringpool_t stringpool_contents = + { + "CP1256", + "CP1250", + "CP1251", + "CP850", + "TIS-620", + "CP1254", + "ISO-8859-6", + "EUC-TW", + "ISO-8859-1", + "ISO-8859-9", + "CP1255", + "BIG5", + "CP855", + "CP1257", + "EUC-KR", + "CP857", + "ISO-8859-5", + "ISO-8859-15", + "CP866", + "ISO-8859-7", + "CP861", + "CP869", + "CP874", + "CP864", + "CP1252", + "CP437", + "CP852", + "CP775", + "CP865", + "EUC-JP", + "ISO-8859-2", + "SHIFT_JIS", + "CP1258", + "UTF-8", + "HP-KANA8", + "HP-ROMAN8", + "HP-HEBREW8", + "GB2312", + "ISO-8859-8", + "HP-TURKISH8", + "HP-GREEK8", + "HP-ARABIC8", + "CP862", + "CP1253" + }; +#define stringpool ((const char *) &stringpool_contents) + +static const struct mapping mappings[] = + { + {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, +#line 40 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "cp1256"}, +#line 34 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, "cp1250"}, +#line 35 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, "cp1251"}, +#line 23 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, "cp850"}, +#line 49 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "tis620"}, +#line 38 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "cp1254"}, +#line 16 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "iso88596"}, +#line 53 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "eucTW"}, +#line 13 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "iso88591"}, +#line 19 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "iso88599"}, +#line 39 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "cp1255"}, +#line 54 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "big5"}, +#line 25 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, "cp855"}, +#line 41 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "cp1257"}, +#line 52 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, "eucKR"}, +#line 26 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, "cp857"}, +#line 15 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, "iso88595"}, +#line 20 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, "iso885915"}, +#line 31 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, "cp866"}, +#line 17 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, "iso88597"}, +#line 27 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, "cp861"}, +#line 32 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, "cp869"}, +#line 33 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, "cp874"}, +#line 29 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, "cp864"}, +#line 36 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, "cp1252"}, +#line 21 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, "cp437"}, +#line 24 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, "cp852"}, +#line 22 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, "cp775"}, +#line 30 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, "cp865"}, +#line 51 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, "eucJP"}, +#line 14 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, "iso88592"}, +#line 55 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str37, "sjis"}, +#line 42 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, "cp1258"}, +#line 56 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str39, "utf8"}, +#line 48 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, "kana8"}, +#line 43 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, "roman8"}, +#line 46 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, "hebrew8"}, +#line 50 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, "hp15CN"}, +#line 18 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, "iso88598"}, +#line 47 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str45, "turkish8"}, +#line 45 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str46, "greek8"}, +#line 44 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, "arabic8"}, +#line 28 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str48, "cp862"}, +#line 37 "./iconv_open-hpux.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str49, "cp1253"} + }; + +#ifdef __GNUC__ +__inline +#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ +__attribute__ ((__gnu_inline__)) +#endif +#endif +const struct mapping * +mapping_lookup (register const char *str, register unsigned int len) +{ + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + register int key = mapping_hash (str, len); + + if (key <= MAX_HASH_VALUE && key >= 0) + { + register int o = mappings[key].standard_name; + if (o >= 0) + { + register const char *s = o + stringpool; + + if (*str == *s && !strcmp (str + 1, s + 1)) + return &mappings[key]; + } + } + } + return 0; +} diff --git a/lib/iconv_open-irix.h b/lib/iconv_open-irix.h new file mode 100644 index 0000000..74ceb8f --- /dev/null +++ b/lib/iconv_open-irix.h @@ -0,0 +1,199 @@ +/* ANSI-C code produced by gperf version 3.0.4 */ +/* Command-line: gperf -m 10 ./iconv_open-irix.gperf */ +/* Computed positions: -k'1,$' */ + +#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ + && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ + && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ + && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ + && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ + && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ + && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ + && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ + && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ + && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ + && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ + && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ + && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ + && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ + && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ + && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ + && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ + && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ + && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ + && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ + && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ + && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ + && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) +/* The character set is not based on ISO-646. */ +#error "gperf generated tables don't work with this execution character set. Please report a bug to ." +#endif + +#line 1 "./iconv_open-irix.gperf" +struct mapping { int standard_name; const char vendor_name[10 + 1]; }; + +#define TOTAL_KEYWORDS 19 +#define MIN_WORD_LENGTH 5 +#define MAX_WORD_LENGTH 11 +#define MIN_HASH_VALUE 5 +#define MAX_HASH_VALUE 23 +/* maximum key range = 19, duplicates = 0 */ + +#ifdef __GNUC__ +__inline +#else +#ifdef __cplusplus +inline +#endif +#endif +static unsigned int +mapping_hash (register const char *str, register unsigned int len) +{ + static const unsigned char asso_values[] = + { + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 8, 2, + 5, 12, 11, 0, 10, 9, 8, 7, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 0, 24, 0, + 24, 5, 24, 0, 24, 7, 24, 24, 24, 24, + 7, 24, 1, 0, 8, 24, 24, 0, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24 + }; + return len + asso_values[(unsigned char)str[len - 1]] + asso_values[(unsigned char)str[0]]; +} + +struct stringpool_t + { + char stringpool_str5[sizeof("CP855")]; + char stringpool_str6[sizeof("EUC-TW")]; + char stringpool_str7[sizeof("EUC-KR")]; + char stringpool_str8[sizeof("CP1251")]; + char stringpool_str9[sizeof("SHIFT_JIS")]; + char stringpool_str10[sizeof("ISO-8859-5")]; + char stringpool_str11[sizeof("ISO-8859-15")]; + char stringpool_str12[sizeof("ISO-8859-1")]; + char stringpool_str13[sizeof("EUC-JP")]; + char stringpool_str14[sizeof("KOI8-R")]; + char stringpool_str15[sizeof("ISO-8859-2")]; + char stringpool_str16[sizeof("GB2312")]; + char stringpool_str17[sizeof("ISO-8859-9")]; + char stringpool_str18[sizeof("ISO-8859-8")]; + char stringpool_str19[sizeof("ISO-8859-7")]; + char stringpool_str20[sizeof("ISO-8859-6")]; + char stringpool_str21[sizeof("ISO-8859-4")]; + char stringpool_str22[sizeof("ISO-8859-3")]; + char stringpool_str23[sizeof("TIS-620")]; + }; +static const struct stringpool_t stringpool_contents = + { + "CP855", + "EUC-TW", + "EUC-KR", + "CP1251", + "SHIFT_JIS", + "ISO-8859-5", + "ISO-8859-15", + "ISO-8859-1", + "EUC-JP", + "KOI8-R", + "ISO-8859-2", + "GB2312", + "ISO-8859-9", + "ISO-8859-8", + "ISO-8859-7", + "ISO-8859-6", + "ISO-8859-4", + "ISO-8859-3", + "TIS-620" + }; +#define stringpool ((const char *) &stringpool_contents) + +static const struct mapping mappings[] = + { + {-1}, {-1}, {-1}, {-1}, {-1}, +#line 24 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str5, "DOS855"}, +#line 29 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "eucTW"}, +#line 28 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, "eucKR"}, +#line 25 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, "WIN1251"}, +#line 30 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, "sjis"}, +#line 17 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "ISO8859-5"}, +#line 22 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "ISO8859-15"}, +#line 13 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "ISO8859-1"}, +#line 27 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "eucJP"}, +#line 23 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "KOI8"}, +#line 14 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "ISO8859-2"}, +#line 26 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "eucCN"}, +#line 21 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "ISO8859-9"}, +#line 20 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, "ISO8859-8"}, +#line 19 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "ISO8859-7"}, +#line 18 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, "ISO8859-6"}, +#line 16 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, "ISO8859-4"}, +#line 15 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, "ISO8859-3"}, +#line 31 "./iconv_open-irix.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, "TIS620"} + }; + +#ifdef __GNUC__ +__inline +#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ +__attribute__ ((__gnu_inline__)) +#endif +#endif +const struct mapping * +mapping_lookup (register const char *str, register unsigned int len) +{ + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + register int key = mapping_hash (str, len); + + if (key <= MAX_HASH_VALUE && key >= 0) + { + register int o = mappings[key].standard_name; + if (o >= 0) + { + register const char *s = o + stringpool; + + if (*str == *s && !strcmp (str + 1, s + 1)) + return &mappings[key]; + } + } + } + return 0; +} diff --git a/lib/iconv_open-osf.h b/lib/iconv_open-osf.h new file mode 100644 index 0000000..4d35764 --- /dev/null +++ b/lib/iconv_open-osf.h @@ -0,0 +1,278 @@ +/* ANSI-C code produced by gperf version 3.0.4 */ +/* Command-line: gperf -m 10 ./iconv_open-osf.gperf */ +/* Computed positions: -k'4,$' */ + +#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ + && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ + && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ + && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ + && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ + && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ + && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ + && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ + && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ + && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ + && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ + && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ + && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ + && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ + && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ + && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ + && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ + && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ + && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ + && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ + && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ + && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ + && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) +/* The character set is not based on ISO-646. */ +#error "gperf generated tables don't work with this execution character set. Please report a bug to ." +#endif + +#line 1 "./iconv_open-osf.gperf" +struct mapping { int standard_name; const char vendor_name[10 + 1]; }; + +#define TOTAL_KEYWORDS 38 +#define MIN_WORD_LENGTH 4 +#define MAX_WORD_LENGTH 11 +#define MIN_HASH_VALUE 6 +#define MAX_HASH_VALUE 47 +/* maximum key range = 42, duplicates = 0 */ + +#ifdef __GNUC__ +__inline +#else +#ifdef __cplusplus +inline +#endif +#endif +static unsigned int +mapping_hash (register const char *str, register unsigned int len) +{ + static const unsigned char asso_values[] = + { + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 2, 29, + 24, 34, 31, 0, 15, 14, 10, 13, 2, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 7, 48, 48, 48, 48, 48, 48, + 11, 48, 2, 7, 48, 48, 48, 1, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48 + }; + return len + asso_values[(unsigned char)str[3]+3] + asso_values[(unsigned char)str[len - 1]]; +} + +struct stringpool_t + { + char stringpool_str6[sizeof("CP1255")]; + char stringpool_str7[sizeof("CP775")]; + char stringpool_str8[sizeof("CP1250")]; + char stringpool_str9[sizeof("EUC-TW")]; + char stringpool_str10[sizeof("EUC-KR")]; + char stringpool_str11[sizeof("TIS-620")]; + char stringpool_str12[sizeof("ISO-8859-5")]; + char stringpool_str13[sizeof("ISO-8859-15")]; + char stringpool_str14[sizeof("BIG5")]; + char stringpool_str15[sizeof("CP855")]; + char stringpool_str16[sizeof("CP1258")]; + char stringpool_str17[sizeof("CP850")]; + char stringpool_str18[sizeof("CP865")]; + char stringpool_str19[sizeof("EUC-JP")]; + char stringpool_str20[sizeof("CP1257")]; + char stringpool_str21[sizeof("CP1256")]; + char stringpool_str22[sizeof("ISO-8859-8")]; + char stringpool_str23[sizeof("SHIFT_JIS")]; + char stringpool_str25[sizeof("ISO-8859-9")]; + char stringpool_str26[sizeof("ISO-8859-7")]; + char stringpool_str27[sizeof("ISO-8859-6")]; + char stringpool_str29[sizeof("CP857")]; + char stringpool_str30[sizeof("CP1252")]; + char stringpool_str31[sizeof("CP869")]; + char stringpool_str32[sizeof("CP949")]; + char stringpool_str33[sizeof("CP866")]; + char stringpool_str34[sizeof("CP437")]; + char stringpool_str35[sizeof("CP1251")]; + char stringpool_str36[sizeof("ISO-8859-2")]; + char stringpool_str37[sizeof("CP1254")]; + char stringpool_str38[sizeof("CP874")]; + char stringpool_str39[sizeof("CP852")]; + char stringpool_str40[sizeof("CP1253")]; + char stringpool_str41[sizeof("ISO-8859-1")]; + char stringpool_str42[sizeof("CP862")]; + char stringpool_str43[sizeof("ISO-8859-4")]; + char stringpool_str46[sizeof("ISO-8859-3")]; + char stringpool_str47[sizeof("CP861")]; + }; +static const struct stringpool_t stringpool_contents = + { + "CP1255", + "CP775", + "CP1250", + "EUC-TW", + "EUC-KR", + "TIS-620", + "ISO-8859-5", + "ISO-8859-15", + "BIG5", + "CP855", + "CP1258", + "CP850", + "CP865", + "EUC-JP", + "CP1257", + "CP1256", + "ISO-8859-8", + "SHIFT_JIS", + "ISO-8859-9", + "ISO-8859-7", + "ISO-8859-6", + "CP857", + "CP1252", + "CP869", + "CP949", + "CP866", + "CP437", + "CP1251", + "ISO-8859-2", + "CP1254", + "CP874", + "CP852", + "CP1253", + "ISO-8859-1", + "CP862", + "ISO-8859-4", + "ISO-8859-3", + "CP861" + }; +#define stringpool ((const char *) &stringpool_contents) + +static const struct mapping mappings[] = + { + {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, +#line 41 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "cp1255"}, +#line 24 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, "cp775"}, +#line 36 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, "cp1250"}, +#line 47 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, "eucTW"}, +#line 46 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "eucKR"}, +#line 50 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "TACTIS"}, +#line 17 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "ISO8859-5"}, +#line 22 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "ISO8859-15"}, +#line 48 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "big5"}, +#line 27 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "cp855"}, +#line 44 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "cp1258"}, +#line 25 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "cp850"}, +#line 31 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, "cp865"}, +#line 45 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "eucJP"}, +#line 43 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, "cp1257"}, +#line 42 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, "cp1256"}, +#line 20 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, "ISO8859-8"}, +#line 49 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, "SJIS"}, + {-1}, +#line 21 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, "ISO8859-9"}, +#line 19 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, "ISO8859-7"}, +#line 18 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, "ISO8859-6"}, + {-1}, +#line 28 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, "cp857"}, +#line 38 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, "cp1252"}, +#line 33 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, "cp869"}, +#line 35 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, "KSC5601"}, +#line 32 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, "cp866"}, +#line 23 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, "cp437"}, +#line 37 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, "cp1251"}, +#line 14 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, "ISO8859-2"}, +#line 40 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str37, "cp1254"}, +#line 34 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, "cp874"}, +#line 26 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str39, "cp852"}, +#line 39 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, "cp1253"}, +#line 13 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, "ISO8859-1"}, +#line 30 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, "cp862"}, +#line 16 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, "ISO8859-4"}, + {-1}, {-1}, +#line 15 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str46, "ISO8859-3"}, +#line 29 "./iconv_open-osf.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, "cp861"} + }; + +#ifdef __GNUC__ +__inline +#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ +__attribute__ ((__gnu_inline__)) +#endif +#endif +const struct mapping * +mapping_lookup (register const char *str, register unsigned int len) +{ + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + register int key = mapping_hash (str, len); + + if (key <= MAX_HASH_VALUE && key >= 0) + { + register int o = mappings[key].standard_name; + if (o >= 0) + { + register const char *s = o + stringpool; + + if (*str == *s && !strcmp (str + 1, s + 1)) + return &mappings[key]; + } + } + } + return 0; +} diff --git a/lib/iconv_open-solaris.h b/lib/iconv_open-solaris.h new file mode 100644 index 0000000..630cde1 --- /dev/null +++ b/lib/iconv_open-solaris.h @@ -0,0 +1,190 @@ +/* ANSI-C code produced by gperf version 3.0.4 */ +/* Command-line: gperf -m 10 ./iconv_open-solaris.gperf */ +/* Computed positions: -k'10' */ + +#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ + && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ + && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ + && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ + && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ + && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ + && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ + && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ + && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ + && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ + && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ + && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ + && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ + && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ + && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ + && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ + && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ + && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ + && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ + && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ + && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ + && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ + && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) +/* The character set is not based on ISO-646. */ +#error "gperf generated tables don't work with this execution character set. Please report a bug to ." +#endif + +#line 1 "./iconv_open-solaris.gperf" +struct mapping { int standard_name; const char vendor_name[10 + 1]; }; + +#define TOTAL_KEYWORDS 13 +#define MIN_WORD_LENGTH 5 +#define MAX_WORD_LENGTH 11 +#define MIN_HASH_VALUE 5 +#define MAX_HASH_VALUE 19 +/* maximum key range = 15, duplicates = 0 */ + +#ifdef __GNUC__ +__inline +#else +#ifdef __cplusplus +inline +#endif +#endif +static unsigned int +mapping_hash (register const char *str, register unsigned int len) +{ + static const unsigned char asso_values[] = + { + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 0, + 9, 8, 7, 6, 5, 4, 3, 2, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20 + }; + register int hval = len; + + switch (hval) + { + default: + hval += asso_values[(unsigned char)str[9]]; + /*FALLTHROUGH*/ + case 9: + case 8: + case 7: + case 6: + case 5: + break; + } + return hval; +} + +struct stringpool_t + { + char stringpool_str5[sizeof("ASCII")]; + char stringpool_str6[sizeof("CP1251")]; + char stringpool_str7[sizeof("$ abc")]; + char stringpool_str10[sizeof("ISO-8859-1")]; + char stringpool_str11[sizeof("ISO-8859-15")]; + char stringpool_str12[sizeof("ISO-8859-9")]; + char stringpool_str13[sizeof("ISO-8859-8")]; + char stringpool_str14[sizeof("ISO-8859-7")]; + char stringpool_str15[sizeof("ISO-8859-6")]; + char stringpool_str16[sizeof("ISO-8859-5")]; + char stringpool_str17[sizeof("ISO-8859-4")]; + char stringpool_str18[sizeof("ISO-8859-3")]; + char stringpool_str19[sizeof("ISO-8859-2")]; + }; +static const struct stringpool_t stringpool_contents = + { + "ASCII", + "CP1251", + "$ abc", + "ISO-8859-1", + "ISO-8859-15", + "ISO-8859-9", + "ISO-8859-8", + "ISO-8859-7", + "ISO-8859-6", + "ISO-8859-5", + "ISO-8859-4", + "ISO-8859-3", + "ISO-8859-2" + }; +#define stringpool ((const char *) &stringpool_contents) + +static const struct mapping mappings[] = + { + {-1}, {-1}, {-1}, {-1}, {-1}, +#line 19 "./iconv_open-solaris.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str5, "646"}, +#line 30 "./iconv_open-solaris.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "ansi-1251"}, +#line 18 "./iconv_open-solaris.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str7}, + {-1}, {-1}, +#line 20 "./iconv_open-solaris.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "ISO8859-1"}, +#line 29 "./iconv_open-solaris.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "ISO8859-15"}, +#line 28 "./iconv_open-solaris.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "ISO8859-9"}, +#line 27 "./iconv_open-solaris.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "ISO8859-8"}, +#line 26 "./iconv_open-solaris.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "ISO8859-7"}, +#line 25 "./iconv_open-solaris.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "ISO8859-6"}, +#line 24 "./iconv_open-solaris.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "ISO8859-5"}, +#line 23 "./iconv_open-solaris.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "ISO8859-4"}, +#line 22 "./iconv_open-solaris.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, "ISO8859-3"}, +#line 21 "./iconv_open-solaris.gperf" + {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "ISO8859-2"} + }; + +#ifdef __GNUC__ +__inline +#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ +__attribute__ ((__gnu_inline__)) +#endif +#endif +const struct mapping * +mapping_lookup (register const char *str, register unsigned int len) +{ + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + register int key = mapping_hash (str, len); + + if (key <= MAX_HASH_VALUE && key >= 0) + { + register int o = mappings[key].standard_name; + if (o >= 0) + { + register const char *s = o + stringpool; + + if (*str == *s && !strcmp (str + 1, s + 1)) + return &mappings[key]; + } + } + } + return 0; +} From 76cbdad171bd29cac7256b52d61c3895df595d4c Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 24 May 2014 08:36:03 +1000 Subject: [PATCH 39/39] Update all $Id$ fields to match the exported version --- Makefile.am | 2 +- configure.ac | 2 +- doc/Makefile.am | 2 +- doc/trader.6 | 2 +- m4/Makefile.am | 2 +- po/LINGUAS | 2 +- po/Makevars | 2 +- po/POTFILES.in | 2 +- src/Makefile.am | 2 +- src/exch.c | 2 +- src/exch.h | 2 +- src/fileio.c | 2 +- src/fileio.h | 2 +- src/game.c | 2 +- src/game.h | 2 +- src/globals.c | 2 +- src/globals.h | 2 +- src/help.c | 2 +- src/help.h | 2 +- src/intf.c | 2 +- src/intf.h | 2 +- src/move.c | 2 +- src/move.h | 2 +- src/system.h | 2 +- src/trader.c | 2 +- src/trader.h | 2 +- src/utils.c | 2 +- src/utils.h | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Makefile.am b/Makefile.am index 026f15d..95a0644 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 362 2012-03-14 15:36:23Z john $ +# $Id: Makefile.am 514 2014-05-22 01:05:51Z john $ # # This file, Makefile.am, contains the top-level Makefile for Star # Traders. It needs to be processed by automake to produce the diff --git a/configure.ac b/configure.ac index c127a9a..bc666f0 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl * * dnl ********************************************************************* dnl dnl Author: John Zaitseff -dnl $Id: configure.ac 477 2012-05-08 21:09:33Z john $ +dnl $Id: configure.ac 514 2014-05-22 01:05:51Z john $ dnl dnl This file, configure.ac, contains information required by autoconf to dnl generate the corresponding configure script. diff --git a/doc/Makefile.am b/doc/Makefile.am index 39e078d..3ef429c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,7 +6,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 362 2012-03-14 15:36:23Z john $ +# $Id: Makefile.am 514 2014-05-22 01:05:51Z john $ # # This file, doc/Makefile.am, contains the documentation directory # Makefile for Star Traders. It needs to be processed by automake to diff --git a/doc/trader.6 b/doc/trader.6 index 0f95a17..2bac64e 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -6,7 +6,7 @@ .\" ********************************************************************* .\" .\" Author: John Zaitseff -.\" $Id: trader.6 368 2012-03-15 23:49:25Z john $ +.\" $Id: trader.6 523 2014-05-23 21:28:25Z john $ .\" .\" This program is free software: you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by diff --git a/m4/Makefile.am b/m4/Makefile.am index 5f5c52f..92f4c22 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -6,7 +6,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 362 2012-03-14 15:36:23Z john $ +# $Id: Makefile.am 524 2014-05-23 21:31:22Z john $ # # This file, m4/Makefile.am, contains the m4 macro directory Makefile for # Star Traders. It needs to be processed by automake to produce the diff --git a/po/LINGUAS b/po/LINGUAS index 04232d3..4f7c603 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -6,7 +6,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: LINGUAS 433 2012-04-14 00:41:18Z john $ +# $Id: LINGUAS 514 2014-05-22 01:05:51Z john $ # # This file, po/LINGUAS, contains a list of the available languages in # the po directory. diff --git a/po/Makevars b/po/Makevars index 81fd7bb..37275d1 100644 --- a/po/Makevars +++ b/po/Makevars @@ -6,7 +6,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: Makevars 393 2012-03-25 08:08:57Z john $ +# $Id: Makevars 518 2014-05-22 01:45:57Z john $ # # This file, po/Makevars, contains variables that are substituted into # po/Makefile for use with GNU gettext. diff --git a/po/POTFILES.in b/po/POTFILES.in index aae9ee0..dfdc774 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,7 +6,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: POTFILES.in 362 2012-03-14 15:36:23Z john $ +# $Id: POTFILES.in 514 2014-05-22 01:05:51Z john $ # # This file, po/POTFILES.in, contains a list of source files which # contain translatable strings. diff --git a/src/Makefile.am b/src/Makefile.am index 3c83e63..b13de6a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 362 2012-03-14 15:36:23Z john $ +# $Id: Makefile.am 514 2014-05-22 01:05:51Z john $ # # This file, src/Makefile.am, contains the source-code Makefile for Star # Traders. It needs to be processed by automake to produce the diff --git a/src/exch.c b/src/exch.c index 8dd08d2..a874a0f 100644 --- a/src/exch.c +++ b/src/exch.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: exch.c 436 2012-04-14 02:36:43Z john $ + $Id: exch.c 514 2014-05-22 01:05:51Z john $ This file, exch.c, contains the implementation of functions dealing with the Interstellar Stock Exchange and Trading Bank as used in Star diff --git a/src/exch.h b/src/exch.h index d09e1bf..9fa4ce7 100644 --- a/src/exch.h +++ b/src/exch.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: exch.h 362 2012-03-14 15:36:23Z john $ + $Id: exch.h 514 2014-05-22 01:05:51Z john $ This file, exch.h, contains declarations for functions dealing with the Interstellar Stock Exchange and Trading Bank as used in Star Traders. diff --git a/src/fileio.c b/src/fileio.c index 5c77d70..1024326 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: fileio.c 418 2012-03-29 09:05:51Z john $ + $Id: fileio.c 521 2014-05-23 08:56:24Z john $ This file, fileio.c, contains the implementation of the game load and save functions used in Star Traders. diff --git a/src/fileio.h b/src/fileio.h index 344c129..f9eb667 100644 --- a/src/fileio.h +++ b/src/fileio.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: fileio.h 362 2012-03-14 15:36:23Z john $ + $Id: fileio.h 514 2014-05-22 01:05:51Z john $ This file, fileio.h, contains declarations for the load and save game functions used in Star Traders. diff --git a/src/game.c b/src/game.c index 068a633..0deb910 100644 --- a/src/game.c +++ b/src/game.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: game.c 362 2012-03-14 15:36:23Z john $ + $Id: game.c 514 2014-05-22 01:05:51Z john $ This file, game.c, contains the implementation of the starting and ending game functions used in Star Traders, as well as the functions diff --git a/src/game.h b/src/game.h index d767749..3becda7 100644 --- a/src/game.h +++ b/src/game.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: game.h 362 2012-03-14 15:36:23Z john $ + $Id: game.h 514 2014-05-22 01:05:51Z john $ This file, game.h, contains declarations for the starting and ending game functions used in Star Traders. It also contains prototypes of diff --git a/src/globals.c b/src/globals.c index 8569b05..79af4c6 100644 --- a/src/globals.c +++ b/src/globals.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: globals.c 403 2012-03-28 00:45:17Z john $ + $Id: globals.c 514 2014-05-22 01:05:51Z john $ This file, globals.c, contains the actual global variables and structures used in Star Traders. diff --git a/src/globals.h b/src/globals.h index ca5463f..f7b1c32 100644 --- a/src/globals.h +++ b/src/globals.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: globals.h 396 2012-03-26 23:13:57Z john $ + $Id: globals.h 514 2014-05-22 01:05:51Z john $ This file, globals.h, contains declarations for global variables and structures used in Star Traders. diff --git a/src/help.c b/src/help.c index 1a4ae73..4b47f47 100644 --- a/src/help.c +++ b/src/help.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: help.c 435 2012-04-14 02:19:52Z john $ + $Id: help.c 514 2014-05-22 01:05:51Z john $ This file, help.c, contains the actual implementation of help functions as used in Star Traders. diff --git a/src/help.h b/src/help.h index 243c525..0e2ab0d 100644 --- a/src/help.h +++ b/src/help.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: help.h 362 2012-03-14 15:36:23Z john $ + $Id: help.h 514 2014-05-22 01:05:51Z john $ This file, help.h, contains declarations for help functions as used in Star Traders. diff --git a/src/intf.c b/src/intf.c index bd8f24f..f787fc7 100644 --- a/src/intf.c +++ b/src/intf.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: intf.c 362 2012-03-14 15:36:23Z john $ + $Id: intf.c 514 2014-05-22 01:05:51Z john $ This file, intf.c, contains the actual implementation of basic text input/output routines as used in Star Traders. diff --git a/src/intf.h b/src/intf.h index 4949610..5182465 100644 --- a/src/intf.h +++ b/src/intf.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: intf.h 362 2012-03-14 15:36:23Z john $ + $Id: intf.h 514 2014-05-22 01:05:51Z john $ This file, intf.h, contains declarations for basic text input/output functions used in Star Traders. It uses the X/Open Curses library to diff --git a/src/move.c b/src/move.c index ee32680..fc37d36 100644 --- a/src/move.c +++ b/src/move.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: move.c 426 2012-03-30 23:57:29Z john $ + $Id: move.c 514 2014-05-22 01:05:51Z john $ This file, move.c, contains the implementation of functions that make and process a game move in Star Traders. diff --git a/src/move.h b/src/move.h index e1a1d84..9bb4039 100644 --- a/src/move.h +++ b/src/move.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: move.h 362 2012-03-14 15:36:23Z john $ + $Id: move.h 514 2014-05-22 01:05:51Z john $ This file, move.h, contains declarations for functions that make and process a game move in Star Traders. diff --git a/src/system.h b/src/system.h index c037aea..8d5c7b7 100644 --- a/src/system.h +++ b/src/system.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: system.h 362 2012-03-14 15:36:23Z john $ + $Id: system.h 520 2014-05-22 08:17:02Z john $ This file, system.h, contains system-specific definitions and #include directives for Star Traders. diff --git a/src/trader.c b/src/trader.c index 2677ba6..5e0bc6d 100644 --- a/src/trader.c +++ b/src/trader.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: trader.c 362 2012-03-14 15:36:23Z john $ + $Id: trader.c 514 2014-05-22 01:05:51Z john $ Star Traders is a simple game of interstellar trading, where the object of the game is to create companies, buy and sell shares, borrow and diff --git a/src/trader.h b/src/trader.h index 3c782c3..407f8d5 100644 --- a/src/trader.h +++ b/src/trader.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: trader.h 362 2012-03-14 15:36:23Z john $ + $Id: trader.h 521 2014-05-23 08:56:24Z john $ This file, trader.h, contains overall definitions for Star Traders. This allows source files to include just one file: this one. diff --git a/src/utils.c b/src/utils.c index 4b8ace3..f36a9f7 100644 --- a/src/utils.c +++ b/src/utils.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: utils.c 362 2012-03-14 15:36:23Z john $ + $Id: utils.c 521 2014-05-23 08:56:24Z john $ This file, utils.c, contains the implementation of various utility functions used in Star Traders. diff --git a/src/utils.h b/src/utils.h index 47302e9..e4dba53 100644 --- a/src/utils.h +++ b/src/utils.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: utils.h 362 2012-03-14 15:36:23Z john $ + $Id: utils.h 521 2014-05-23 08:56:24Z john $ This file, utils.h, contains declarations for various utility functions used in Star Traders.