From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from vmicros1.altlinux.org (vmicros1.altlinux.org [194.107.17.57]) by sourceware.org (Postfix) with ESMTP id 9056E3858D29 for ; Tue, 15 Dec 2020 23:40:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9056E3858D29 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=ldv@altlinux.org Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by vmicros1.altlinux.org (Postfix) with ESMTP id 1254E72C8B5 for ; Wed, 16 Dec 2020 02:40:33 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id 038557CC819; Wed, 16 Dec 2020 02:40:32 +0300 (MSK) Date: Wed, 16 Dec 2020 02:40:32 +0300 From: "Dmitry V. Levin" To: elfutils-devel@sourceware.org Subject: [PATCH] Modernize gettext infrastructure Message-ID: <20201215234032.GA19917@altlinux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_ASCII_DIVIDERS, KAM_DMARC_STATUS, SCC_10_SHORT_WORD_LINES, SCC_5_SHORT_WORD_LINES, SPAM_BODY, SPF_HELO_NONE, SPF_PASS, TXREP, WEIRD_QUOTING autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Dec 2020 23:40:44 -0000 Switch to use AM_GNU_GETTEXT, AM_GNU_GETTEXT_VERSION, and AM_GNU_GETTEXT_REQUIRE_VERSION, this allows to stop bundling gettext infrastructure files and let autoreconf invoke autopoint which will set the gettext infrastructure up. Use this opportunity to create separate .gitignore files for m4/ and po/ directories. Tested with autoreconf -if && ./configure --enable-maintainer-mode && make && make dist= check Signed-off-by: Dmitry V. Levin --- .gitignore | 12 +- ABOUT-NLS | 1068 ---------------------------------------- ChangeLog | 6 + configure.ac | 14 +- m4/.gitignore | 5 + m4/ChangeLog | 2 + m4/codeset.m4 | 23 - m4/gettext.m4 | 401 --------------- m4/iconv.m4 | 268 ---------- m4/lcmessage.m4 | 32 -- m4/nls.m4 | 31 -- m4/po.m4 | 452 ----------------- m4/progtest.m4 | 92 ---- po/.gitignore | 18 + po/ChangeLog | 3 + po/Makefile.in.in | 453 ----------------- po/Makevars | 24 + po/Rules-quot | 47 -- po/boldquot.sed | 10 - po/en@boldquot.header | 25 - po/en@quot.header | 22 - po/insert-header.sin | 23 - po/quot.sed | 6 - po/remove-potcdate.sin | 19 - 24 files changed, 70 insertions(+), 2986 deletions(-) delete mode 100644 ABOUT-NLS create mode 100644 m4/.gitignore delete mode 100644 m4/codeset.m4 delete mode 100644 m4/gettext.m4 delete mode 100644 m4/iconv.m4 delete mode 100644 m4/lcmessage.m4 delete mode 100644 m4/nls.m4 delete mode 100644 m4/po.m4 delete mode 100644 m4/progtest.m4 create mode 100644 po/.gitignore delete mode 100644 po/Makefile.in.in delete mode 100644 po/Rules-quot delete mode 100644 po/boldquot.sed delete mode 100644 po/en@boldquot.header delete mode 100644 po/en@quot.header delete mode 100644 po/insert-header.sin delete mode 100644 po/quot.sed delete mode 100644 po/remove-potcdate.sin diff --git a/.gitignore b/.gitignore index d737b14d..595760d4 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ .deps .glimpse_* =3D* +/ABOUT-NLS /INSTALL Makefile Makefile.in @@ -28,6 +29,7 @@ Makefile.in /config/ar-lib /config/compile /config/config.guess +/config/config.rpath /config/config.sub /config/depcomp /config/install-sh @@ -47,16 +49,6 @@ Makefile.in /debuginfod/debuginfod /debuginfod/debuginfod-find /libdw/known-dwarf.h -/po/*.gmo -/po/*.pot -/po/en@boldquot.insert-header -/po/en@boldquot.po -/po/en@quot.insert-header -/po/en@quot.po -/po/Makevars.template -/po/POTFILES -/po/remove-potcdate.sed -/po/stamp-po /src/addr2line /src/ar /src/elfclassify diff --git a/ABOUT-NLS b/ABOUT-NLS deleted file mode 100644 index 83bc72ec..00000000 --- a/ABOUT-NLS +++ /dev/null @@ -1,1068 +0,0 @@ -1 Notes on the Free Translation Project -*************************************** - -Free software is going international! The Free Translation Project is -a way to get maintainers of free software, translators, and users all -together, so that free software will gradually become able to speak many -languages. A few packages already provide translations for their -messages. - - If you found this `ABOUT-NLS' file inside a distribution, you may -assume that the distributed package does use GNU `gettext' internally, -itself available at your nearest GNU archive site. But you do _not_ -need to install GNU `gettext' prior to configuring, installing or using -this package with messages translated. - - Installers will find here some useful hints. These notes also -explain how users should proceed for getting the programs to use the -available translations. They tell how people wanting to contribute and -work on translations can contact the appropriate team. - - When reporting bugs in the `intl/' directory or bugs which may be -related to internationalization, you should tell about the version of -`gettext' which is used. The information can be found in the -`intl/VERSION' file, in internationalized packages. - -1.1 Quick configuration advice -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D - -If you want to exploit the full power of internationalization, you -should configure it using - - ./configure --with-included-gettext - -to force usage of internationalizing routines provided within this -package, despite the existence of internationalizing capabilities in the -operating system where this package is being installed. So far, only -the `gettext' implementation in the GNU C library version 2 provides as -many features (such as locale alias, message inheritance, automatic -charset conversion or plural form handling) as the implementation here. -It is also not possible to offer this additional functionality on top -of a `catgets' implementation. Future versions of GNU `gettext' will -very likely convey even more functionality. So it might be a good idea -to change to GNU `gettext' as soon as possible. - - So you need _not_ provide this option if you are using GNU libc 2 or -you have installed a recent copy of the GNU gettext package with the -included `libintl'. - -1.2 INSTALL Matters -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -Some packages are "localizable" when properly installed; the programs -they contain can be made to speak your own native language. Most such -packages use GNU `gettext'. Other packages have their own ways to -internationalization, predating GNU `gettext'. - - By default, this package will be installed to allow translation of -messages. It will automatically detect whether the system already -provides the GNU `gettext' functions. If not, the included GNU -`gettext' library will be used. This library is wholly contained -within this package, usually in the `intl/' subdirectory, so prior -installation of the GNU `gettext' package is _not_ required. -Installers may use special options at configuration time for changing -the default behaviour. The commands: - - ./configure --with-included-gettext - ./configure --disable-nls - -will, respectively, bypass any pre-existing `gettext' to use the -internationalizing routines provided within this package, or else, -_totally_ disable translation of messages. - - When you already have GNU `gettext' installed on your system and run -configure without an option for your new package, `configure' will -probably detect the previously built and installed `libintl.a' file and -will decide to use this. This might not be desirable. You should use -the more recent version of the GNU `gettext' library. I.e. if the file -`intl/VERSION' shows that the library which comes with this package is -more recent, you should use - - ./configure --with-included-gettext - -to prevent auto-detection. - - The configuration process will not test for the `catgets' function -and therefore it will not be used. The reason is that even an -emulation of `gettext' on top of `catgets' could not provide all the -extensions of the GNU `gettext' library. - - Internationalized packages usually have many `po/LL.po' files, where -LL gives an ISO 639 two-letter code identifying the language. Unless -translations have been forbidden at `configure' time by using the -`--disable-nls' switch, all available translations are installed -together with the package. However, the environment variable `LINGUAS' -may be set, prior to configuration, to limit the installed set. -`LINGUAS' should then contain a space separated list of two-letter -codes, stating which languages are allowed. - -1.3 Using This Package -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -As a user, if your language has been installed for this package, you -only have to set the `LANG' environment variable to the appropriate -`LL_CC' combination. If you happen to have the `LC_ALL' or some other -`LC_xxx' environment variables set, you should unset them before -setting `LANG', otherwise the setting of `LANG' will not have the -desired effect. Here `LL' is an ISO 639 two-letter language code, and -`CC' is an ISO 3166 two-letter country code. For example, let's -suppose that you speak German and live in Germany. At the shell -prompt, merely execute `setenv LANG de_DE' (in `csh'), -`export LANG; LANG=3Dde_DE' (in `sh') or `export LANG=3Dde_DE' (in `bash'). -This can be done from your `.login' or `.profile' file, once and for -all. - - You might think that the country code specification is redundant. -But in fact, some languages have dialects in different countries. For -example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The -country code serves to distinguish the dialects. - - The locale naming convention of `LL_CC', with `LL' denoting the -language and `CC' denoting the country, is the one use on systems based -on GNU libc. On other systems, some variations of this scheme are -used, such as `LL' or `LL_CC.ENCODING'. You can get the list of -locales supported by your system for your language by running the -command `locale -a | grep '^LL''. - - Not all programs have translations for all languages. By default, an -English message is shown in place of a nonexistent translation. If you -understand other languages, you can set up a priority list of languages. -This is done through a different environment variable, called -`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' -for the purpose of message handling, but you still need to have `LANG' -set to the primary language; this is required by other parts of the -system libraries. For example, some Swedish users who would rather -read translations in German than English for when Swedish is not -available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. - - Special advice for Norwegian users: The language code for Norwegian -bokma*l changed from `no' to `nb' recently (in 2003). During the -transition period, while some message catalogs for this language are -installed under `nb' and some older ones under `no', it's recommended -for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and -older translations are used. - - In the `LANGUAGE' environment variable, but not in the `LANG' -environment variable, `LL_CC' combinations can be abbreviated as `LL' -to denote the language's main dialect. For example, `de' is equivalent -to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' -(Portuguese as spoken in Portugal) in this context. - -1.4 Translating Teams -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -For the Free Translation Project to be a success, we need interested -people who like their own language and write it well, and who are also -able to synergize with other translators speaking the same language. -Each translation team has its own mailing list. The up-to-date list of -teams can be found at the Free Translation Project's homepage, -`http://translationproject.org/', in the "Teams" area. - - If you'd like to volunteer to _work_ at translating messages, you -should become a member of the translating team for your own language. -The subscribing address is _not_ the same as the list itself, it has -`-request' appended. For example, speakers of Swedish can send a -message to `sv-request@li.org', having this message body: - - subscribe - - Keep in mind that team members are expected to participate -_actively_ in translations, or at solving translational difficulties, -rather than merely lurking around. If your team does not exist yet and -you want to start one, or if you are unsure about what to do or how to -get started, please write to `coordinator@translationproject.org' to -reach the coordinator for all translator teams. - - The English team is special. It works at improving and uniformizing -the terminology in use. Proven linguistic skills are praised more than -programming skills, here. - -1.5 Available Packages -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of November -2007. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination, with a -translation percentage of at least 50%. - - Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB = eo - +-------------------------------------------------= ---+ - Compendium | [] [] [] [] = | - a2ps | [] [] [] [] [] = | - aegis | () = | - ant-phone | () = | - anubis | [] = | - ap-utils | = | - aspell | [] [] [] [] [] = | - bash | = [] | - bfd | = | - bibshelf | [] = | - binutils | = | - bison | [] [] = | - bison-runtime | [] = | - bluez-pin | [] [] [] [] = [] | - cflow | [] = | - clisp | [] [] [] = | - console-tools | [] [] = | - coreutils | [] [] [] [] = | - cpio | = | - cpplib | [] [] [] = | - cryptonit | [] = | - dialog | = | - diffutils | [] [] [] [] [] = [] | - doodle | [] = | - e2fsprogs | [] [] = | - enscript | [] [] [] [] = | - fetchmail | [] [] () [] [] = | - findutils | [] = | - findutils_stable | [] [] [] = | - flex | [] [] [] = | - fslint | = | - gas | = | - gawk | [] [] [] = | - gcal | [] = | - gcc | [] = | - gettext-examples | [] [] [] [] = [] | - gettext-runtime | [] [] [] [] = [] | - gettext-tools | [] [] = | - gip | [] = | - gliv | [] [] = | - glunarclock | [] = | - gmult | [] [] = | - gnubiff | () = | - gnucash | [] [] () () [] = | - gnuedu | = | - gnulib | [] = | - gnunet | = | - gnunet-gtk | = | - gnutls | [] = | - gpe-aerial | [] [] = | - gpe-beam | [] [] = | - gpe-calendar | = | - gpe-clock | [] [] = | - gpe-conf | [] [] = | - gpe-contacts | = | - gpe-edit | [] = | - gpe-filemanager | = | - gpe-go | [] = | - gpe-login | [] [] = | - gpe-ownerinfo | [] [] = | - gpe-package | = | - gpe-sketchbook | [] [] = | - gpe-su | [] [] = | - gpe-taskmanager | [] [] = | - gpe-timesheet | [] = | - gpe-today | [] [] = | - gpe-todo | = | - gphoto2 | [] [] [] [] = | - gprof | [] [] = | - gpsdrive | = | - gramadoir | [] [] = | - grep | [] = [] | - gretl | () = | - gsasl | = | - gss | = | - gst-plugins-bad | [] [] = | - gst-plugins-base | [] [] = | - gst-plugins-good | [] [] [] = | - gst-plugins-ugly | [] [] = | - gstreamer | [] [] [] [] [] [] [] = | - gtick | () = | - gtkam | [] [] [] [] = | - gtkorphan | [] [] = | - gtkspell | [] [] [] = [] | - gutenprint | [] = | - hello | [] [] [] [] = [] | - herrie | [] = | - hylafax | = | - idutils | [] [] = | - indent | [] [] [] = [] | - iso_15924 | = | - iso_3166 | [] [] [] [] [] [] [] [] [] [] = [] | - iso_3166_2 | = | - iso_4217 | [] [] [] = | - iso_639 | [] [] [] = [] | - jpilot | [] = | - jtag | = | - jwhois | = | - kbd | [] [] [] [] = | - keytouch | [] [] = | - keytouch-editor | [] = | - keytouch-keyboa... | [] = | - latrine | () = | - ld | [] = | - leafpad | [] [] [] [] [] = | - libc | [] [] [] [] = | - libexif | [] = | - libextractor | [] = | - libgpewidget | [] [] [] = | - libgpg-error | [] = | - libgphoto2 | [] [] = | - libgphoto2_port | [] [] = | - libgsasl | = | - libiconv | [] = [] | - libidn | [] [] = [] | - lifelines | [] () = | - lilypond | [] = | - lingoteach | = | - lprng | = | - lynx | [] [] [] [] = | - m4 | [] [] [] [] = | - mailfromd | = | - mailutils | [] = | - make | [] [] = | - man-db | [] [] [] = | - minicom | [] [] [] = | - nano | [] [] [] = | - opcodes | [] = | - parted | [] [] = | - pilot-qof | = | - popt | [] [] [] = | - psmisc | [] = | - pwdutils | = | - qof | = | - radius | [] = | - recode | [] [] [] [] [] = [] | - rpm | [] = | - screem | = | - scrollkeeper | [] [] [] [] [] [] [] [] = | - sed | [] [] = [] | - shared-mime-info | [] [] [] [] () [] [] = [] | - sharutils | [] [] [] [] [] [] = | - shishi | = | - skencil | [] () = | - solfege | = | - soundtracker | [] [] = | - sp | [] = | - system-tools-ba... | [] [] [] [] [] [] [] [] [] = | - tar | [] [] = | - texinfo | [] [] = [] | - tin | () () = | - tuxpaint | [] [] [] [] [] = [] | - unicode-han-tra... | = | - unicode-transla... | = | - util-linux | [] [] [] [] = | - util-linux-ng | [] [] [] [] = | - vorbis-tools | [] = | - wastesedge | () = | - wdiff | [] [] [] [] = | - wget | [] [] [] = | - xchat | [] [] [] [] [] [] [] = | - xkeyboard-config | [] = | - xpad | [] [] [] = | - +-------------------------------------------------= ---+ - af am ar az be bg bs ca cs cy da de el en en_GB = eo - 6 0 2 1 8 26 2 40 48 2 56 88 15 1 15 = 18 - - es et eu fa fi fr ga gl gu he hi hr hu id is it - +-------------------------------------------------= -+ - Compendium | [] [] [] [] [] = | - a2ps | [] [] [] ()= | - aegis | = | - ant-phone | [] = | - anubis | [] = | - ap-utils | [] [] = | - aspell | [] [] []= | - bash | [] = | - bfd | [] [] = | - bibshelf | [] [] []= | - binutils | [] [] [] = | - bison | [] [] [] [] [] []= | - bison-runtime | [] [] [] [] []= | - bluez-pin | [] [] [] [] [] = | - cflow | [] = | - clisp | [] [] = | - console-tools | = | - coreutils | [] [] [] [] [] [] = | - cpio | [] [] [] = | - cpplib | [] [] = | - cryptonit | [] = | - dialog | [] [] []= | - diffutils | [] [] [] [] [] [] [] [] []= | - doodle | [] []= | - e2fsprogs | [] [] []= | - enscript | [] [] [] = | - fetchmail | [] = | - findutils | [] [] [] = | - findutils_stable | [] [] [] [] = | - flex | [] [] [] = | - fslint | = | - gas | [] [] = | - gawk | [] [] [] [] ()= | - gcal | [] [] = | - gcc | [] = | - gettext-examples | [] [] [] [] [] [] []= | - gettext-runtime | [] [] [] [] [] []= | - gettext-tools | [] [] [] []= | - gip | [] [] [] [] = | - gliv | () = | - glunarclock | [] [] [] = | - gmult | [] [] []= | - gnubiff | () ()= | - gnucash | () () () = | - gnuedu | [] = | - gnulib | [] [] [] = | - gnunet | = | - gnunet-gtk | = | - gnutls | = | - gpe-aerial | [] [] = | - gpe-beam | [] [] = | - gpe-calendar | = | - gpe-clock | [] [] [] [] = | - gpe-conf | [] = | - gpe-contacts | [] [] = | - gpe-edit | [] [] [] [] = | - gpe-filemanager | [] = | - gpe-go | [] [] [] = | - gpe-login | [] [] [] = | - gpe-ownerinfo | [] [] [] [] [] = | - gpe-package | [] = | - gpe-sketchbook | [] [] = | - gpe-su | [] [] [] [] = | - gpe-taskmanager | [] [] [] = | - gpe-timesheet | [] [] [] [] = | - gpe-today | [] [] [] [] = | - gpe-todo | [] = | - gphoto2 | [] [] [] [] []= | - gprof | [] [] [] [] [] = | - gpsdrive | [] = | - gramadoir | [] [] = | - grep | [] [] [] = | - gretl | [] [] [] ()= | - gsasl | [] [] = | - gss | [] [] = | - gst-plugins-bad | [] [] [] []= | - gst-plugins-base | [] [] [] []= | - gst-plugins-good | [] [] [] [] []= | - gst-plugins-ugly | [] [] [] []= | - gstreamer | [] [] []= | - gtick | [] [] []= | - gtkam | [] [] [] []= | - gtkorphan | [] []= | - gtkspell | [] [] [] [] [] [] []= | - gutenprint | [] = | - hello | [] [] [] [] [] [] [] [] [] [] [] [] []= | - herrie | [] = | - hylafax | = | - idutils | [] [] [] [] []= | - indent | [] [] [] [] [] [] [] [] [] []= | - iso_15924 | [] = | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] []= | - iso_3166_2 | [] = | - iso_4217 | [] [] [] [] [] []= | - iso_639 | [] [] [] [] [] [] = | - jpilot | [] [] = | - jtag | [] = | - jwhois | [] [] [] [] []= | - kbd | [] [] = | - keytouch | [] [] []= | - keytouch-editor | [] = | - keytouch-keyboa... | [] []= | - latrine | [] []= | - ld | [] [] [] [] = | - leafpad | [] [] [] [] [] []= | - libc | [] [] [] [] [] = | - libexif | [] = | - libextractor | [] = | - libgpewidget | [] [] [] [] [] = | - libgpg-error | [] = | - libgphoto2 | [] [] []= | - libgphoto2_port | [] []= | - libgsasl | [] [] = | - libiconv | [] [] [] = | - libidn | [] []= | - lifelines | () = | - lilypond | [] [] [] = | - lingoteach | [] [] []= | - lprng | = | - lynx | [] [] []= | - m4 | [] [] [] [] = | - mailfromd | = | - mailutils | [] [] = | - make | [] [] [] [] [] [] [] [] = | - man-db | []= | - minicom | [] [] [] [] = | - nano | [] [] [] [] [] [] []= | - opcodes | [] [] [] [] = | - parted | [] [] []= | - pilot-qof | = | - popt | [] [] [] [] = | - psmisc | [] []= | - pwdutils | = | - qof | [] = | - radius | [] [] = | - recode | [] [] [] [] [] [] [] []= | - rpm | [] [] = | - screem | = | - scrollkeeper | [] [] [] = | - sed | [] [] [] [] [] = | - shared-mime-info | [] [] [] [] [] []= | - sharutils | [] [] [] [] [] [] [] []= | - shishi | [] = | - skencil | [] [] = | - solfege | []= | - soundtracker | [] [] []= | - sp | [] = | - system-tools-ba... | [] [] [] [] [] [] [] [] []= | - tar | [] [] [] [] [] = | - texinfo | [] [] [] = | - tin | [] () = | - tuxpaint | [] [] = | - unicode-han-tra... | = | - unicode-transla... | [] [] = | - util-linux | [] [] [] [] [] [] []= | - util-linux-ng | [] [] [] [] [] [] []= | - vorbis-tools | = | - wastesedge | () = | - wdiff | [] [] [] [] [] [] [] []= | - wget | [] [] [] [] [] [] [] []= | - xchat | [] [] [] [] [] [] []= | - xkeyboard-config | [] [] [] [] = | - xpad | [] [] [] = | - +-------------------------------------------------= -+ - es et eu fa fi fr ga gl gu he hi hr hu id is it - 85 22 14 2 48 101 61 12 2 8 2 6 53 29 1 52 - - ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn - +-------------------------------------------------= -+ - Compendium | [] = | - a2ps | () [] [] = | - aegis | () = | - ant-phone | [] = | - anubis | [] [] [] = | - ap-utils | [] = | - aspell | [] [] = | - bash | [] = | - bfd | = | - bibshelf | [] = | - binutils | = | - bison | [] [] [] = | - bison-runtime | [] [] [] = | - bluez-pin | [] [] [] = | - cflow | = | - clisp | [] = | - console-tools | = | - coreutils | [] = | - cpio | [] = | - cpplib | [] = | - cryptonit | [] = | - dialog | [] [] = | - diffutils | [] [] [] = | - doodle | = | - e2fsprogs | [] = | - enscript | [] = | - fetchmail | [] [] = | - findutils | [] = | - findutils_stable | [] = | - flex | [] [] = | - fslint | = | - gas | = | - gawk | [] [] = | - gcal | = | - gcc | = | - gettext-examples | [] [] [] = | - gettext-runtime | [] [] [] = | - gettext-tools | [] [] = | - gip | [] [] = | - gliv | [] = | - glunarclock | [] [] = | - gmult | [] [] [] = | - gnubiff | = | - gnucash | () () () = | - gnuedu | = | - gnulib | [] [] = | - gnunet | = | - gnunet-gtk | = | - gnutls | [] = | - gpe-aerial | [] = | - gpe-beam | [] = | - gpe-calendar | [] = | - gpe-clock | [] [] [] = | - gpe-conf | [] [] [] = | - gpe-contacts | [] = | - gpe-edit | [] [] [] = | - gpe-filemanager | [] [] = | - gpe-go | [] [] [] = | - gpe-login | [] [] [] = | - gpe-ownerinfo | [] [] = | - gpe-package | [] [] = | - gpe-sketchbook | [] [] = | - gpe-su | [] [] [] = | - gpe-taskmanager | [] [] [] [] = | - gpe-timesheet | [] = | - gpe-today | [] [] = | - gpe-todo | [] = | - gphoto2 | [] [] = | - gprof | [] = | - gpsdrive | [] = | - gramadoir | () = | - grep | [] [] = | - gretl | = | - gsasl | [] = | - gss | = | - gst-plugins-bad | [] = | - gst-plugins-base | [] = | - gst-plugins-good | [] = | - gst-plugins-ugly | [] = | - gstreamer | [] = | - gtick | [] = | - gtkam | [] [] = | - gtkorphan | [] = | - gtkspell | [] [] = | - gutenprint | [] = | - hello | [] [] [] [] [] [] []= | - herrie | [] = | - hylafax | = | - idutils | [] = | - indent | [] [] = | - iso_15924 | [] = | - iso_3166 | [] [] [] [] [] [] [] []= | - iso_3166_2 | [] = | - iso_4217 | [] [] [] = | - iso_639 | [] [] [] []= | - jpilot | () () = | - jtag | = | - jwhois | [] = | - kbd | [] = | - keytouch | [] = | - keytouch-editor | [] = | - keytouch-keyboa... | = | - latrine | [] = | - ld | = | - leafpad | [] [] = | - libc | [] [] [] = | - libexif | = | - libextractor | = | - libgpewidget | [] = | - libgpg-error | = | - libgphoto2 | [] = | - libgphoto2_port | [] = | - libgsasl | [] = | - libiconv | [] = | - libidn | [] [] = | - lifelines | [] = | - lilypond | [] = | - lingoteach | [] = | - lprng | = | - lynx | [] [] = | - m4 | [] [] = | - mailfromd | = | - mailutils | = | - make | [] [] [] = | - man-db | = | - minicom | [] = | - nano | [] [] [] = | - opcodes | [] = | - parted | [] [] = | - pilot-qof | = | - popt | [] [] [] = | - psmisc | [] [] [] = | - pwdutils | = | - qof | = | - radius | = | - recode | [] = | - rpm | [] [] = | - screem | [] = | - scrollkeeper | [] [] [] []= | - sed | [] [] = | - shared-mime-info | [] [] [] [] [] [] []= | - sharutils | [] [] = | - shishi | = | - skencil | = | - solfege | () ()= | - soundtracker | = | - sp | () = | - system-tools-ba... | [] [] [] [] = | - tar | [] [] [] = | - texinfo | [] [] = | - tin | = | - tuxpaint | () [] []= | - unicode-han-tra... | = | - unicode-transla... | = | - util-linux | [] [] = | - util-linux-ng | [] [] = | - vorbis-tools | = | - wastesedge | [] = | - wdiff | [] [] = | - wget | [] [] = | - xchat | [] [] [] [] = | - xkeyboard-config | [] [] [] = | - xpad | [] [] [] = | - +-------------------------------------------------= -+ - ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn - 51 2 25 3 2 0 6 0 2 2 20 0 11 1 103 6 - - or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - +-------------------------------------------------= -+ - Compendium | [] [] [] [] [] = | - a2ps | () [] [] [] [] [] [] = | - aegis | () () = | - ant-phone | [] [] = | - anubis | [] [] [] = | - ap-utils | () = | - aspell | [] [] [] = | - bash | [] [] = | - bfd | = | - bibshelf | [] = | - binutils | [] [] = | - bison | [] [] [] [] [] = | - bison-runtime | [] [] [] [] [] = | - bluez-pin | [] [] [] [] [] [] [] [] [] = | - cflow | [] = | - clisp | [] = | - console-tools | [] = | - coreutils | [] [] [] [] = | - cpio | [] [] [] = | - cpplib | [] = | - cryptonit | [] [] = | - dialog | [] = | - diffutils | [] [] [] [] [] [] = | - doodle | [] [] = | - e2fsprogs | [] [] = | - enscript | [] [] [] [] [] = | - fetchmail | [] [] [] = | - findutils | [] [] [] = | - findutils_stable | [] [] [] [] [] [] = | - flex | [] [] [] [] [] = | - fslint | [] = | - gas | = | - gawk | [] [] [] [] = | - gcal | [] = | - gcc | [] [] = | - gettext-examples | [] [] [] [] [] [] [] [] = | - gettext-runtime | [] [] [] [] [] [] [] [] = | - gettext-tools | [] [] [] [] [] [] [] = | - gip | [] [] [] [] = | - gliv | [] [] [] [] [] [] = | - glunarclock | [] [] [] [] [] [] = | - gmult | [] [] [] [] = | - gnubiff | () [] = | - gnucash | () [] = | - gnuedu | = | - gnulib | [] [] [] = | - gnunet | = | - gnunet-gtk | [] = | - gnutls | [] [] = | - gpe-aerial | [] [] [] [] [] [] [] = | - gpe-beam | [] [] [] [] [] [] [] = | - gpe-calendar | [] [] [] [] = | - gpe-clock | [] [] [] [] [] [] [] [] = | - gpe-conf | [] [] [] [] [] [] [] = | - gpe-contacts | [] [] [] [] [] = | - gpe-edit | [] [] [] [] [] [] [] [] [] = | - gpe-filemanager | [] [] = | - gpe-go | [] [] [] [] [] [] [] [] = | - gpe-login | [] [] [] [] [] [] [] [] = | - gpe-ownerinfo | [] [] [] [] [] [] [] [] = | - gpe-package | [] [] = | - gpe-sketchbook | [] [] [] [] [] [] [] [] = | - gpe-su | [] [] [] [] [] [] [] [] = | - gpe-taskmanager | [] [] [] [] [] [] [] [] = | - gpe-timesheet | [] [] [] [] [] [] [] [] = | - gpe-today | [] [] [] [] [] [] [] [] = | - gpe-todo | [] [] [] [] = | - gphoto2 | [] [] [] [] [] [] = | - gprof | [] [] [] = | - gpsdrive | [] [] = | - gramadoir | [] [] = | - grep | [] [] [] [] = | - gretl | [] [] [] = | - gsasl | [] [] [] = | - gss | [] [] [] [] = | - gst-plugins-bad | [] [] [] = | - gst-plugins-base | [] [] = | - gst-plugins-good | [] [] = | - gst-plugins-ugly | [] [] [] = | - gstreamer | [] [] [] [] = | - gtick | [] = | - gtkam | [] [] [] [] [] = | - gtkorphan | [] = | - gtkspell | [] [] [] [] [] [] [] [] = | - gutenprint | [] = | - hello | [] [] [] [] [] [] [] [] = | - herrie | [] [] [] = | - hylafax | = | - idutils | [] [] [] [] [] = | - indent | [] [] [] [] [] [] [] = | - iso_15924 | = | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] []= | - iso_3166_2 | = | - iso_4217 | [] [] [] [] [] [] [] = | - iso_639 | [] [] [] [] [] [] [] = | - jpilot | = | - jtag | [] = | - jwhois | [] [] [] [] = | - kbd | [] [] [] = | - keytouch | [] = | - keytouch-editor | [] = | - keytouch-keyboa... | [] = | - latrine | = | - ld | [] = | - leafpad | [] [] [] [] [] []= | - libc | [] [] [] [] = | - libexif | [] [] = | - libextractor | [] [] = | - libgpewidget | [] [] [] [] [] [] [] [] = | - libgpg-error | [] [] [] = | - libgphoto2 | [] = | - libgphoto2_port | [] [] [] = | - libgsasl | [] [] [] [] = | - libiconv | [] [] [] = | - libidn | [] [] () = | - lifelines | [] [] = | - lilypond | = | - lingoteach | [] = | - lprng | [] = | - lynx | [] [] [] = | - m4 | [] [] [] [] [] = | - mailfromd | [] = | - mailutils | [] [] [] = | - make | [] [] [] [] = | - man-db | [] [] [] [] = | - minicom | [] [] [] [] [] = | - nano | [] [] [] [] = | - opcodes | [] [] = | - parted | [] = | - pilot-qof | = | - popt | [] [] [] [] = | - psmisc | [] [] = | - pwdutils | [] [] = | - qof | [] [] = | - radius | [] [] = | - recode | [] [] [] [] [] [] [] = | - rpm | [] [] [] [] = | - screem | = | - scrollkeeper | [] [] [] [] [] [] [] = | - sed | [] [] [] [] [] [] [] [] [] = | - shared-mime-info | [] [] [] [] [] [] = | - sharutils | [] [] [] [] = | - shishi | [] = | - skencil | [] [] [] = | - solfege | [] = | - soundtracker | [] [] = | - sp | = | - system-tools-ba... | [] [] [] [] [] [] [] [] []= | - tar | [] [] [] [] = | - texinfo | [] [] [] [] = | - tin | () = | - tuxpaint | [] [] [] [] [] [] = | - unicode-han-tra... | = | - unicode-transla... | = | - util-linux | [] [] [] [] = | - util-linux-ng | [] [] [] [] = | - vorbis-tools | [] = | - wastesedge | = | - wdiff | [] [] [] [] [] [] [] = | - wget | [] [] [] [] = | - xchat | [] [] [] [] [] [] [] = | - xkeyboard-config | [] [] [] = | - xpad | [] [] [] = | - +-------------------------------------------------= -+ - or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - 0 5 77 31 53 4 58 72 3 45 46 9 45 122 3 - - tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - +-------------------------------------------------= --+ - Compendium | [] [] [] [] = | 19 - a2ps | [] [] [] = | 19 - aegis | [] = | 1 - ant-phone | [] [] = | 6 - anubis | [] [] [] = | 11 - ap-utils | () [] = | 4 - aspell | [] [] [] = | 16 - bash | [] = | 6 - bfd | = | 2 - bibshelf | [] = | 7 - binutils | [] [] [] [] = | 9 - bison | [] [] [] [] = | 20 - bison-runtime | [] [] [] [] = | 18 - bluez-pin | [] [] [] [] [] [] = | 28 - cflow | [] [] = | 5 - clisp | = | 9 - console-tools | [] [] = | 5 - coreutils | [] [] [] = | 18 - cpio | [] [] [] [] = | 11 - cpplib | [] [] [] [] [] = | 12 - cryptonit | [] = | 6 - dialog | [] [] [] = | 9 - diffutils | [] [] [] [] [] = | 29 - doodle | [] = | 6 - e2fsprogs | [] [] = | 10 - enscript | [] [] [] = | 16 - fetchmail | [] [] = | 12 - findutils | [] [] [] = | 11 - findutils_stable | [] [] [] [] = | 18 - flex | [] [] = | 15 - fslint | [] = | 2 - gas | [] = | 3 - gawk | [] [] [] = | 16 - gcal | [] = | 5 - gcc | [] [] [] = | 7 - gettext-examples | [] [] [] [] [] [] = | 29 - gettext-runtime | [] [] [] [] [] [] = | 28 - gettext-tools | [] [] [] [] [] = | 20 - gip | [] [] = | 13 - gliv | [] [] = | 11 - glunarclock | [] [] [] = | 15 - gmult | [] [] [] [] = | 16 - gnubiff | [] = | 2 - gnucash | () [] = | 5 - gnuedu | [] = | 2 - gnulib | [] = | 10 - gnunet | = | 0 - gnunet-gtk | [] [] = | 3 - gnutls | = | 4 - gpe-aerial | [] [] = | 14 - gpe-beam | [] [] = | 14 - gpe-calendar | [] [] = | 7 - gpe-clock | [] [] [] [] = | 21 - gpe-conf | [] [] [] = | 16 - gpe-contacts | [] [] = | 10 - gpe-edit | [] [] [] [] [] = | 22 - gpe-filemanager | [] [] = | 7 - gpe-go | [] [] [] [] = | 19 - gpe-login | [] [] [] [] [] = | 21 - gpe-ownerinfo | [] [] [] [] = | 21 - gpe-package | [] = | 6 - gpe-sketchbook | [] [] = | 16 - gpe-su | [] [] [] [] = | 21 - gpe-taskmanager | [] [] [] [] = | 21 - gpe-timesheet | [] [] [] [] = | 18 - gpe-today | [] [] [] [] [] = | 21 - gpe-todo | [] [] = | 8 - gphoto2 | [] [] [] [] = | 21 - gprof | [] [] = | 13 - gpsdrive | [] = | 5 - gramadoir | [] = | 7 - grep | [] = | 12 - gretl | = | 6 - gsasl | [] [] [] = | 9 - gss | [] = | 7 - gst-plugins-bad | [] [] [] = | 13 - gst-plugins-base | [] [] = | 11 - gst-plugins-good | [] [] [] [] [] = | 16 - gst-plugins-ugly | [] [] [] = | 13 - gstreamer | [] [] [] = | 18 - gtick | [] [] = | 7 - gtkam | [] = | 16 - gtkorphan | [] = | 7 - gtkspell | [] [] [] [] [] [] = | 27 - gutenprint | = | 4 - hello | [] [] [] [] [] = | 38 - herrie | [] [] = | 8 - hylafax | = | 0 - idutils | [] [] = | 15 - indent | [] [] [] [] [] = | 28 - iso_15924 | [] [] = | 4 - iso_3166 | [] [] [] [] [] [] [] [] [] = | 54 - iso_3166_2 | [] [] = | 4 - iso_4217 | [] [] [] [] [] = | 24 - iso_639 | [] [] [] [] [] = | 26 - jpilot | [] [] [] [] = | 7 - jtag | [] = | 3 - jwhois | [] [] [] = | 13 - kbd | [] [] [] = | 13 - keytouch | [] = | 8 - keytouch-editor | [] = | 5 - keytouch-keyboa... | [] = | 5 - latrine | [] [] = | 5 - ld | [] [] [] [] = | 10 - leafpad | [] [] [] [] [] = | 24 - libc | [] [] [] = | 19 - libexif | [] = | 5 - libextractor | [] = | 5 - libgpewidget | [] [] [] = | 20 - libgpg-error | [] = | 6 - libgphoto2 | [] [] = | 9 - libgphoto2_port | [] [] [] = | 11 - libgsasl | [] = | 8 - libiconv | [] [] = | 11 - libidn | [] [] = | 11 - lifelines | = | 4 - lilypond | [] = | 6 - lingoteach | [] = | 6 - lprng | [] = | 2 - lynx | [] [] [] = | 15 - m4 | [] [] [] = | 18 - mailfromd | [] [] = | 3 - mailutils | [] [] = | 8 - make | [] [] [] = | 20 - man-db | [] = | 9 - minicom | [] = | 14 - nano | [] [] [] = | 20 - opcodes | [] [] = | 10 - parted | [] [] [] = | 11 - pilot-qof | [] = | 1 - popt | [] [] [] [] = | 18 - psmisc | [] [] = | 10 - pwdutils | [] = | 3 - qof | [] = | 4 - radius | [] [] = | 7 - recode | [] [] [] = | 25 - rpm | [] [] [] [] = | 13 - screem | [] = | 2 - scrollkeeper | [] [] [] [] = | 26 - sed | [] [] [] [] = | 23 - shared-mime-info | [] [] [] = | 29 - sharutils | [] [] [] = | 23 - shishi | [] = | 3 - skencil | [] = | 7 - solfege | [] = | 3 - soundtracker | [] [] = | 9 - sp | [] = | 3 - system-tools-ba... | [] [] [] [] [] [] [] = | 38 - tar | [] [] [] = | 17 - texinfo | [] [] [] = | 15 - tin | = | 1 - tuxpaint | [] [] [] = | 19 - unicode-han-tra... | = | 0 - unicode-transla... | = | 2 - util-linux | [] [] [] = | 20 - util-linux-ng | [] [] [] = | 20 - vorbis-tools | [] [] = | 4 - wastesedge | = | 1 - wdiff | [] [] = | 23 - wget | [] [] [] = | 20 - xchat | [] [] [] [] = | 29 - xkeyboard-config | [] [] [] = | 14 - xpad | [] [] [] = | 15 - +-------------------------------------------------= --+ - 76 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - 163 domains 0 3 1 74 51 0 143 21 1 57 7 45 = 0 2036 - - Some counters in the preceding matrix are higher than the number of -visible blocks let us expect. This is because a few extra PO files are -used for implementing regional variants of languages, or language -dialects. - - For a PO file in the matrix above to be effective, the package to -which it applies should also have been internationalized and -distributed as such by its maintainer. There might be an observable -lag between the mere existence a PO file and its wide availability in a -distribution. - - If November 2007 seems to be old, you may fetch a more recent copy -of this `ABOUT-NLS' file on most GNU archive sites. The most -up-to-date matrix with full percentage details can be found at -`http://translationproject.org/extra/matrix.html'. - -1.6 Using `gettext' in new packages -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -If you are writing a freely available program and want to -internationalize it you are welcome to use GNU `gettext' in your -package. Of course you have to respect the GNU Library General Public -License which covers the use of the GNU `gettext' library. This means -in particular that even non-free programs can use `libintl' as a shared -library, whereas only free software can use `libintl' as a static -library or use modified versions of `libintl'. - - Once the sources are changed appropriately and the setup can handle -the use of `gettext' the only thing missing are the translations. The -Free Translation Project is also available for packages which are not -developed inside the GNU project. Therefore the information given above -applies also for every other Free Software Project. Contact -`coordinator@translationproject.org' to make the `.pot' files available -to the translation teams. - diff --git a/ChangeLog b/ChangeLog index 46568f04..072a7853 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2020-12-15 Dmitry V. Levin =20 + * configure.ac (USE_NLS, AM_PO_SUBDIRS): Remove. + (AM_GNU_GETTEXT, AM_GNU_GETTEXT_VERSION, + AM_GNU_GETTEXT_REQUIRE_VERSION): Use these macros to setup the gettext + infrastructure. + * .gitignore: Update. + * Makefile.am (SUBDIRS): Remove m4. * configure.ac (AC_CONFIG_FILES): Remove m4/Makefile. =20 diff --git a/configure.ac b/configure.ac index 2d977f28..60747bc8 100644 --- a/configure.ac +++ b/configure.ac @@ -588,10 +588,16 @@ AC_CONFIG_FILES([tests/Makefile]) dnl pkgconfig files AC_CONFIG_FILES([config/libelf.pc config/libdw.pc config/libdebuginfod.pc]) =20 -# Get the definitions necessary to create the Makefiles in the po -# subdirectories. This is a small subset of the gettext rules. -AC_SUBST(USE_NLS, yes) -AM_PO_SUBDIRS +dnl As long as "git grep 'PRI[diouxX]' po" reports matches in +dnl translatable strings, we must use need-formatstring-macros here. +AM_GNU_GETTEXT([external], [need-formatstring-macros]) + +dnl AM_GNU_GETTEXT_VERSION is still needed for old versions +dnl of autoreconf that do not recognize AM_GNU_GETTEXT_REQUIRE_VERSION. +dnl 0.19.6 is the first version of gettext that provides +dnl AM_GNU_GETTEXT_REQUIRE_VERSION support. +AM_GNU_GETTEXT_VERSION([0.19.6]) +AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6]) =20 dnl Appended to the config.h file. dnl We hide all kinds of configuration magic in lib/eu-config.h. diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 00000000..9ed35690 --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,5 @@ +/*.m4 +!/ax_check_compile_flag.m4 +!/ax_cxx_compile_stdcxx.m4 +!/biarch.m4 +!/zip.m4 diff --git a/m4/ChangeLog b/m4/ChangeLog index 78b1bbc9..32832693 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,5 +1,7 @@ 2020-12-15 Dmitry V. Levin =20 + * .gitignore: New file. + * Makefile.am: Remove. =20 2019-10-28 Aaron Merey diff --git a/m4/codeset.m4 b/m4/codeset.m4 deleted file mode 100644 index 59535ebc..00000000 --- a/m4/codeset.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# codeset.m4 serial AM1 (gettext-0.10.40) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -AC_DEFUN([AM_LANGINFO_CODESET], -[ - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([#include ], - [char* cs =3D nl_langinfo(CODESET);], - am_cv_langinfo_codeset=3Dyes, - am_cv_langinfo_codeset=3Dno) - ]) - if test $am_cv_langinfo_codeset =3D yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, - [Define if you have and nl_langinfo(CODESET).]) - fi -]) diff --git a/m4/gettext.m4 b/m4/gettext.m4 deleted file mode 100644 index 8d1f0665..00000000 --- a/m4/gettext.m4 +++ /dev/null @@ -1,401 +0,0 @@ -# gettext.m4 serial 66 (gettext-0.18.2) -dnl Copyright (C) 1995-2013 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 -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -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 Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2006, 2008-2010. - -dnl Macro to add for using GNU gettext. - -dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). -dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The -dnl default (if it is not specified or empty) is 'no-libtool'. -dnl INTLSYMBOL should be 'external' for packages with no intl directory, -dnl and 'no-libtool' or 'use-libtool' for packages with an intl directo= ry. -dnl If INTLSYMBOL is 'use-libtool', then a libtool library -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or stat= ic, -dnl depending on --{enable,disable}-{shared,static} and on the presence= of -dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library -dnl $(top_builddir)/intl/libintl.a will be created. -dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext -dnl implementations (in libc or libintl) without the ngettext() function -dnl will be ignored. If NEEDSYMBOL is specified and is -dnl 'need-formatstring-macros', then GNU gettext implementations that d= on't -dnl support the ISO C 99 formatstring macros will be ignor= ed. -dnl INTLDIR is used to find the intl libraries. If empty, -dnl the value '$(top_builddir)/intl/' is used. -dnl -dnl The result of the configuration is one of three cases: -dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled -dnl and used. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 2) GNU gettext has been found in the system's C library. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 3) No internationalization, always use English msgid. -dnl Catalog format: none -dnl Catalog extension: none -dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. -dnl The use of .gmo is historical (it was needed to avoid overwriting the -dnl GNU format catalogs when building on a platform with an X/Open gettext= ), -dnl but we keep it in order not to force irrelevant filename changes on the -dnl maintainers. -dnl -AC_DEFUN([AM_GNU_GETTEXT], -[ - dnl Argument checking. - ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool= ], , [ifelse([$1], [use-libtool], , - [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT -])])])])]) - ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], - [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] arg= ument is deprecated.])]) - ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-= formatstring-macros], , - [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT -])])])]) - define([gt_included_intl], - ifelse([$1], [external], - ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]), - [yes])) - define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) - gt_NEEDS_INIT - AM_GNU_GETTEXT_NEED([$2]) - - AC_REQUIRE([AM_PO_SUBDIRS])dnl - ifelse(gt_included_intl, yes, [ - AC_REQUIRE([AM_INTL_SUBDIR])dnl - ]) - - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Sometimes libintl requires libiconv, so first search for libiconv. - dnl Ideally we would do this search only after the - dnl if test "$USE_NLS" =3D "yes"; then - dnl if { eval "gt_val=3D\$$gt_func_gnugettext_libc"; test "$gt_va= l" !=3D "yes"; }; then - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT - dnl the configure script would need to contain the same shell code - dnl again, outside any 'if'. There are two solutions: - dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. - dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. - dnl Since AC_PROVIDE_IFELSE is only in autoconf >=3D 2.52 and not - dnl documented, we avoid it. - ifelse(gt_included_intl, yes, , [ - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - ]) - - dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. - gt_INTL_MACOSX - - dnl Set USE_NLS. - AC_REQUIRE([AM_NLS]) - - ifelse(gt_included_intl, yes, [ - BUILD_INCLUDED_LIBINTL=3Dno - USE_INCLUDED_LIBINTL=3Dno - ]) - LIBINTL=3D - LTLIBINTL=3D - POSUB=3D - - dnl Add a version number to the cache macros. - case " $gt_needs " in - *" need-formatstring-macros "*) gt_api_version=3D3 ;; - *" need-ngettext "*) gt_api_version=3D2 ;; - *) gt_api_version=3D1 ;; - esac - gt_func_gnugettext_libc=3D"gt_cv_func_gnugettext${gt_api_version}_libc" - gt_func_gnugettext_libintl=3D"gt_cv_func_gnugettext${gt_api_version}_lib= intl" - - dnl If we use NLS figure out what method - if test "$USE_NLS" =3D "yes"; then - gt_use_preinstalled_gnugettext=3Dno - ifelse(gt_included_intl, yes, [ - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH([included-gettext], - [ --with-included-gettext use the GNU gettext library included he= re], - nls_cv_force_use_gnu_gettext=3D$withval, - nls_cv_force_use_gnu_gettext=3Dno) - AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) - - nls_cv_use_gnu_gettext=3D"$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" !=3D "yes"; then - ]) - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If GNU gettext is available we use this. Else we have - dnl to fall back to GNU NLS library. - - if test $gt_api_version -ge 3; then - gt_revision_test_code=3D' -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) =3D=3D 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >=3D 1) - 1]; -changequote([,])dnl -' - else - gt_revision_test_code=3D - fi - if test $gt_api_version -ge 2; then - gt_expression_test_code=3D' + * ngettext ("", "", 0)' - else - gt_expression_test_code=3D - fi - - AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_lib= c], - [AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; - ]], - [[ -bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_do= main_bindings - ]])], - [eval "$gt_func_gnugettext_libc=3Dyes"], - [eval "$gt_func_gnugettext_libc=3Dno"])]) - - if { eval "gt_val=3D\$$gt_func_gnugettext_libc"; test "$gt_val" != =3D "yes"; }; then - dnl Sometimes libintl requires libiconv, so first search for lib= iconv. - ifelse(gt_included_intl, yes, , [ - AM_ICONV_LINK - ]) - dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL - dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) - dnl because that would add "-liconv" to LIBINTL and LTLIBINTL - dnl even if libiconv doesn't exist. - AC_LIB_LINKFLAGS_BODY([intl]) - AC_CACHE_CHECK([for GNU gettext in libintl], - [$gt_func_gnugettext_libintl], - [gt_save_CPPFLAGS=3D"$CPPFLAGS" - CPPFLAGS=3D"$CPPFLAGS $INCINTL" - gt_save_LIBS=3D"$LIBS" - LIBS=3D"$LIBS $LIBINTL" - dnl Now see whether libintl exists and does not depend on libi= conv. - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *); - ]], - [[ -bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_ex= pand_alias ("") - ]])], - [eval "$gt_func_gnugettext_libintl=3Dyes"], - [eval "$gt_func_gnugettext_libintl=3Dno"]) - dnl Now see whether libintl exists and depends on libiconv. - if { eval "gt_val=3D\$$gt_func_gnugettext_libintl"; test "$gt_= val" !=3D yes; } && test -n "$LIBICONV"; then - LIBS=3D"$LIBS $LIBICONV" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *); - ]], - [[ -bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_ex= pand_alias ("") - ]])], - [LIBINTL=3D"$LIBINTL $LIBICONV" - LTLIBINTL=3D"$LTLIBINTL $LTLIBICONV" - eval "$gt_func_gnugettext_libintl=3Dyes" - ]) - fi - CPPFLAGS=3D"$gt_save_CPPFLAGS" - LIBS=3D"$gt_save_LIBS"]) - fi - - dnl If an already present or preinstalled GNU gettext() is found, - dnl use it. But if this macro is used in GNU gettext, and GNU - dnl gettext is already preinstalled in libintl, we update this - dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if { eval "gt_val=3D\$$gt_func_gnugettext_libc"; test "$gt_val" = =3D "yes"; } \ - || { { eval "gt_val=3D\$$gt_func_gnugettext_libintl"; test "$gt= _val" =3D "yes"; } \ - && test "$PACKAGE" !=3D gettext-runtime \ - && test "$PACKAGE" !=3D gettext-tools; }; then - gt_use_preinstalled_gnugettext=3Dyes - else - dnl Reset the values set by searching for libintl. - LIBINTL=3D - LTLIBINTL=3D - INCINTL=3D - fi - - ifelse(gt_included_intl, yes, [ - if test "$gt_use_preinstalled_gnugettext" !=3D "yes"; then - dnl GNU gettext is not found in the C library. - dnl Fall back on included GNU gettext library. - nls_cv_use_gnu_gettext=3Dyes - fi - fi - - if test "$nls_cv_use_gnu_gettext" =3D "yes"; then - dnl Mark actions used to generate GNU NLS library. - BUILD_INCLUDED_LIBINTL=3Dyes - USE_INCLUDED_LIBINTL=3Dyes - LIBINTL=3D"ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt= _libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD" - LTLIBINTL=3D"ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]= gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD" - LIBS=3D`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/= $//'` - fi - - CATOBJEXT=3D - if test "$gt_use_preinstalled_gnugettext" =3D "yes" \ - || test "$nls_cv_use_gnu_gettext" =3D "yes"; then - dnl Mark actions to use GNU gettext tools. - CATOBJEXT=3D.gmo - fi - ]) - - if test -n "$INTL_MACOSX_LIBS"; then - if test "$gt_use_preinstalled_gnugettext" =3D "yes" \ - || test "$nls_cv_use_gnu_gettext" =3D "yes"; then - dnl Some extra flags are needed during linking. - LIBINTL=3D"$LIBINTL $INTL_MACOSX_LIBS" - LTLIBINTL=3D"$LTLIBINTL $INTL_MACOSX_LIBS" - fi - fi - - if test "$gt_use_preinstalled_gnugettext" =3D "yes" \ - || test "$nls_cv_use_gnu_gettext" =3D "yes"; then - AC_DEFINE([ENABLE_NLS], [1], - [Define to 1 if translation of program messages to the user's nati= ve language - is requested.]) - else - USE_NLS=3Dno - fi - fi - - AC_MSG_CHECKING([whether to use NLS]) - AC_MSG_RESULT([$USE_NLS]) - if test "$USE_NLS" =3D "yes"; then - AC_MSG_CHECKING([where the gettext function comes from]) - if test "$gt_use_preinstalled_gnugettext" =3D "yes"; then - if { eval "gt_val=3D\$$gt_func_gnugettext_libintl"; test "$gt_val" = =3D "yes"; }; then - gt_source=3D"external libintl" - else - gt_source=3D"libc" - fi - else - gt_source=3D"included intl directory" - fi - AC_MSG_RESULT([$gt_source]) - fi - - if test "$USE_NLS" =3D "yes"; then - - if test "$gt_use_preinstalled_gnugettext" =3D "yes"; then - if { eval "gt_val=3D\$$gt_func_gnugettext_libintl"; test "$gt_val" = =3D "yes"; }; then - AC_MSG_CHECKING([how to link with libintl]) - AC_MSG_RESULT([$LIBINTL]) - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) - fi - - dnl For backward compatibility. Some packages may be using this. - AC_DEFINE([HAVE_GETTEXT], [1], - [Define if the GNU gettext() function is already present or preinst= alled.]) - AC_DEFINE([HAVE_DCGETTEXT], [1], - [Define if the GNU dcgettext() function is already present or prein= stalled.]) - fi - - dnl We need to process the po/ directory. - POSUB=3Dpo - fi - - ifelse(gt_included_intl, yes, [ - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBIN= TL - dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" =3D gettext-runtime || test "$PACKAGE" =3D gettext-= tools; then - BUILD_INCLUDED_LIBINTL=3Dyes - fi - - dnl Make all variables we use known to autoconf. - AC_SUBST([BUILD_INCLUDED_LIBINTL]) - AC_SUBST([USE_INCLUDED_LIBINTL]) - AC_SUBST([CATOBJEXT]) - - dnl For backward compatibility. Some configure.ins may be using this. - nls_cv_header_intl=3D - nls_cv_header_libgt=3D - - dnl For backward compatibility. Some Makefiles may be using this. - DATADIRNAME=3Dshare - AC_SUBST([DATADIRNAME]) - - dnl For backward compatibility. Some Makefiles may be using this. - INSTOBJEXT=3D.mo - AC_SUBST([INSTOBJEXT]) - - dnl For backward compatibility. Some Makefiles may be using this. - GENCAT=3Dgencat - AC_SUBST([GENCAT]) - - dnl For backward compatibility. Some Makefiles may be using this. - INTLOBJS=3D - if test "$USE_INCLUDED_LIBINTL" =3D yes; then - INTLOBJS=3D"\$(GETTOBJS)" - fi - AC_SUBST([INTLOBJS]) - - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=3Dgt_libtool_suffix_prefix - AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) - ]) - - dnl For backward compatibility. Some Makefiles may be using this. - INTLLIBS=3D"$LIBINTL" - AC_SUBST([INTLLIBS]) - - dnl Make all documented variables known to autoconf. - AC_SUBST([LIBINTL]) - AC_SUBST([LTLIBINTL]) - AC_SUBST([POSUB]) -]) - - -dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. -m4_define([gt_NEEDS_INIT], -[ - m4_divert_text([DEFAULTS], [gt_needs=3D]) - m4_define([gt_NEEDS_INIT], []) -]) - - -dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) -AC_DEFUN([AM_GNU_GETTEXT_NEED], -[ - m4_divert_text([INIT_PREPARE], [gt_needs=3D"$gt_needs $1"]) -]) - - -dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) -AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) diff --git a/m4/iconv.m4 b/m4/iconv.m4 deleted file mode 100644 index a5036465..00000000 --- a/m4/iconv.m4 +++ /dev/null @@ -1,268 +0,0 @@ -# iconv.m4 serial 18 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2007-2013 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 Bruno Haible. - -AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], -[ - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([iconv]) -]) - -AC_DEFUN([AM_ICONV_LINK], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - - dnl Add $INCICONV to CPPFLAGS before performing the following checks, - dnl because if the user has installed libiconv and not disabled its use - dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succee= d. - am_save_CPPFLAGS=3D"$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - - AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ - am_cv_func_iconv=3D"no, consider installing GNU libiconv" - am_cv_lib_iconv=3Dno - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -#include - ]], - [[iconv_t cd =3D iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);]])], - [am_cv_func_iconv=3Dyes]) - if test "$am_cv_func_iconv" !=3D yes; then - am_save_LIBS=3D"$LIBS" - LIBS=3D"$LIBS $LIBICONV" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -#include - ]], - [[iconv_t cd =3D iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);]])], - [am_cv_lib_iconv=3Dyes] - [am_cv_func_iconv=3Dyes]) - LIBS=3D"$am_save_LIBS" - fi - ]) - if test "$am_cv_func_iconv" =3D yes; then - AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ - dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11, - dnl Solaris 10. - am_save_LIBS=3D"$LIBS" - if test $am_cv_lib_iconv =3D yes; then - LIBS=3D"$LIBS $LIBICONV" - fi - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ -#include -#include -int main () -{ - int result =3D 0; - /* Test against AIX 5.1 bug: Failures are not distinguishable from succe= ssful - returns. */ - { - iconv_t cd_utf8_to_88591 =3D iconv_open ("ISO8859-1", "UTF-8"); - if (cd_utf8_to_88591 !=3D (iconv_t)(-1)) - { - static const char input[] =3D "\342\202\254"; /* EURO SIGN */ - char buf[10]; - const char *inptr =3D input; - size_t inbytesleft =3D strlen (input); - char *outptr =3D buf; - size_t outbytesleft =3D sizeof (buf); - size_t res =3D iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res =3D=3D 0) - result |=3D 1; - iconv_close (cd_utf8_to_88591); - } - } - /* Test against Solaris 10 bug: Failures are not distinguishable from - successful returns. */ - { - iconv_t cd_ascii_to_88591 =3D iconv_open ("ISO8859-1", "646"); - if (cd_ascii_to_88591 !=3D (iconv_t)(-1)) - { - static const char input[] =3D "\263"; - char buf[10]; - const char *inptr =3D input; - size_t inbytesleft =3D strlen (input); - char *outptr =3D buf; - size_t outbytesleft =3D sizeof (buf); - size_t res =3D iconv (cd_ascii_to_88591, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res =3D=3D 0) - result |=3D 2; - iconv_close (cd_ascii_to_88591); - } - } - /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ - { - iconv_t cd_88591_to_utf8 =3D iconv_open ("UTF-8", "ISO-8859-1"); - if (cd_88591_to_utf8 !=3D (iconv_t)(-1)) - { - static const char input[] =3D "\304"; - static char buf[2] =3D { (char)0xDE, (char)0xAD }; - const char *inptr =3D input; - size_t inbytesleft =3D 1; - char *outptr =3D buf; - size_t outbytesleft =3D 1; - size_t res =3D iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res !=3D (size_t)(-1) || outptr - buf > 1 || buf[1] !=3D (char= )0xAD) - result |=3D 4; - iconv_close (cd_88591_to_utf8); - } - } -#if 0 /* This bug could be worked around by the caller. */ - /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ - { - iconv_t cd_88591_to_utf8 =3D iconv_open ("utf8", "iso88591"); - if (cd_88591_to_utf8 !=3D (iconv_t)(-1)) - { - static const char input[] =3D "\304rger mit b\366sen B\374bchen oh= ne Augenma\337"; - char buf[50]; - const char *inptr =3D input; - size_t inbytesleft =3D strlen (input); - char *outptr =3D buf; - size_t outbytesleft =3D sizeof (buf); - size_t res =3D iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if ((int)res > 0) - result |=3D 8; - iconv_close (cd_88591_to_utf8); - } - } -#endif - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is - provided. */ - if (/* Try standardized names. */ - iconv_open ("UTF-8", "EUC-JP") =3D=3D (iconv_t)(-1) - /* Try IRIX, OSF/1 names. */ - && iconv_open ("UTF-8", "eucJP") =3D=3D (iconv_t)(-1) - /* Try AIX names. */ - && iconv_open ("UTF-8", "IBM-eucJP") =3D=3D (iconv_t)(-1) - /* Try HP-UX names. */ - && iconv_open ("utf8", "eucJP") =3D=3D (iconv_t)(-1)) - result |=3D 16; - return result; -}]])], - [am_cv_func_iconv_works=3Dyes], - [am_cv_func_iconv_works=3Dno], - [ -changequote(,)dnl - case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works=3D"guessing no" ;; - *) am_cv_func_iconv_works=3D"guessing yes" ;; - esac -changequote([,])dnl - ]) - LIBS=3D"$am_save_LIBS" - ]) - case "$am_cv_func_iconv_works" in - *no) am_func_iconv=3Dno am_cv_lib_iconv=3Dno ;; - *) am_func_iconv=3Dyes ;; - esac - else - am_func_iconv=3Dno am_cv_lib_iconv=3Dno - fi - if test "$am_func_iconv" =3D yes; then - AC_DEFINE([HAVE_ICONV], [1], - [Define if you have the iconv() function and it works.]) - fi - if test "$am_cv_lib_iconv" =3D yes; then - AC_MSG_CHECKING([how to link with libiconv]) - AC_MSG_RESULT([$LIBICONV]) - else - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCIC= ONV - dnl either. - CPPFLAGS=3D"$am_save_CPPFLAGS" - LIBICONV=3D - LTLIBICONV=3D - fi - AC_SUBST([LIBICONV]) - AC_SUBST([LTLIBICONV]) -]) - -dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >=3D 2.64, in order to -dnl avoid warnings like -dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". -dnl This is tricky because of the way 'aclocal' is implemented: -dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. -dnl Otherwise aclocal's initial scan pass would miss the macro definitio= n. -dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expan= sions. -dnl Otherwise aclocal would emit many "Use of uninitialized value $1" -dnl warnings. -m4_define([gl_iconv_AC_DEFUN], - m4_version_prereq([2.64], - [[AC_DEFUN_ONCE( - [$1], [$2])]], - [m4_ifdef([gl_00GNULIB], - [[AC_DEFUN_ONCE( - [$1], [$2])]], - [[AC_DEFUN( - [$1], [$2])]])])) -gl_iconv_AC_DEFUN([AM_ICONV], -[ - AM_ICONV_LINK - if test "$am_cv_func_iconv" =3D yes; then - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL([am_cv_proto_iconv], [ - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outb= uf, size_t *outbytesleft); -#else -size_t iconv(); -#endif - ]], - [[]])], - [am_cv_proto_iconv_arg1=3D""], - [am_cv_proto_iconv_arg1=3D"const"]) - am_cv_proto_iconv=3D"extern size_t iconv (iconv_t cd, $am_cv_proto_i= conv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outby= tesleft);"]) - am_cv_proto_iconv=3D`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e = 's/( /(/'` - AC_MSG_RESULT([ - $am_cv_proto_iconv]) - AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], - [Define as const if the declaration of iconv() needs const.]) - dnl Also substitute ICONV_CONST in the gnulib generated . - m4_ifdef([gl_ICONV_H_DEFAULTS], - [AC_REQUIRE([gl_ICONV_H_DEFAULTS]) - if test -n "$am_cv_proto_iconv_arg1"; then - ICONV_CONST=3D"const" - fi - ]) - fi -]) diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4 deleted file mode 100644 index ffbf915f..00000000 --- a/m4/lcmessage.m4 +++ /dev/null @@ -1,32 +0,0 @@ -# lcmessage.m4 serial 2 (gettext-0.10.40) -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -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 Authors: -dnl Ulrich Drepper , 1995. - -# Check whether LC_MESSAGES is available in . - -AC_DEFUN([AM_LC_MESSAGES], - [if test $ac_cv_header_locale_h =3D yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=3Dyes, am_cv_val_LC_MESSAGES=3Dno)]) - if test $am_cv_val_LC_MESSAGES =3D yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) diff --git a/m4/nls.m4 b/m4/nls.m4 deleted file mode 100644 index 7967cc2f..00000000 --- a/m4/nls.m4 +++ /dev/null @@ -1,31 +0,0 @@ -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 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 -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -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 Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_PREREQ(2.50) - -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=3D$enableval, USE_NLS=3Dyes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) -]) diff --git a/m4/po.m4 b/m4/po.m4 deleted file mode 100644 index f3957234..00000000 --- a/m4/po.m4 +++ /dev/null @@ -1,452 +0,0 @@ -# po.m4 serial 20 (gettext-0.18.2) -dnl Copyright (C) 1995-2013 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 -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -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 Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -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([AC_PROG_MKDIR_P])dnl - AC_REQUIRE([AM_NLS])dnl - - dnl Release version of the gettext macros. This is used to ensure that - dnl the gettext macros and po/Makefile.in.in are in sync. - AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) - - dnl Perform the following tests also if --disable-nls has been given, - dnl because they are needed for "make dist" to work. - - dnl Search for GNU msgfmt in the PATH. - dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. - dnl The second test excludes FreeBSD msgfmt. - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep us= age >/dev/null; then exit 1; else exit 0; fi)], - :) - AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) - - dnl Test whether it is GNU msgfmt >=3D 0.15. -changequote(,)dnl - case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=3D: ;; - *) MSGFMT_015=3D$MSGFMT ;; - esac -changequote([,])dnl - AC_SUBST([MSGFMT_015]) -changequote(,)dnl - case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=3D: ;; - *) GMSGFMT_015=3D$GMSGFMT ;; - esac -changequote([,])dnl - AC_SUBST([GMSGFMT_015]) - - dnl Search for GNU xgettext 0.12 or newer in the PATH. - dnl The first test excludes Solaris xgettext and early GNU xgettext vers= ions. - dnl The second test excludes FreeBSD xgettext. - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder=3D --msgid-bugs-add= ress=3D /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder=3D --msgid-bugs= -address=3D /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1;= else exit 0; fi)], - :) - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - - dnl Test whether it is GNU xgettext >=3D 0.15. -changequote(,)dnl - case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=3D: ;; - *) XGETTEXT_015=3D$XGETTEXT ;; - esac -changequote([,])dnl - AC_SUBST([XGETTEXT_015]) - - dnl Search for GNU msgmerge 0.11 or newer in the PATH. - AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD= [ 2>&1], :) - - dnl Installation directories. - dnl Autoconf >=3D 2.60 defines localedir. For older versions of autoconf= , we - dnl have to define it here, so that it can be used in po/Makefile. - test -n "$localedir" || localedir=3D'${datadir}/locale' - AC_SUBST([localedir]) - - dnl Support for AM_XGETTEXT_OPTION. - test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=3D - AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) - - AC_CONFIG_COMMANDS([po-directories], [[ - for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=3D`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=3D`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix=3D/`echo "$ac_dir"|sed 's%^\./%%'` - ac_dots=3D`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. - test -n "$ac_given_srcdir" || ac_given_srcdir=3D"$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=3D`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir=3D"$ac_given_srcdir" ;; - *) top_srcdir=3D"$ac_dots$ac_given_srcdir" ;; - esac - # Treat a directory as a PO directory if and only if it has a - # POTFILES.in file. This allows packages to have multiple PO - # directories under different names or in different locations. - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || = echo "creating $ac_dir/POTFILES" - gt_tab=3D`printf '\t'` - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "= /^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\= ) \\\\/\1/" > "$ac_dir/POTFILES" - POMAKEFILEDEPS=3D"POTFILES.in" - # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES de= pend - # on $ac_dir but don't depend on user-specified configuration - # parameters. - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in con= figure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obso= lete" - fi - ALL_LINGUAS_=3D`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/= $ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assignment from automake < 1.5. - eval 'ALL_LINGUAS''=3D$ALL_LINGUAS_' - POMAKEFILEDEPS=3D"$POMAKEFILEDEPS LINGUAS" - else - # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assignment from automake < 1.5. - eval 'ALL_LINGUAS''=3D$OBSOLETE_ALL_LINGUAS' - fi - # Compute POFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) - # Compute UPDATEPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) - # Compute DUMMYPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) - # Compute GMOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) - case "$ac_given_srcdir" in - .) srcdirpre=3D ;; - *) srcdirpre=3D'$(srcdir)/' ;; - esac - POFILES=3D - UPDATEPOFILES=3D - DUMMYPOFILES=3D - GMOFILES=3D - for lang in $ALL_LINGUAS; do - POFILES=3D"$POFILES $srcdirpre$lang.po" - UPDATEPOFILES=3D"$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES=3D"$DUMMYPOFILES $lang.nop" - GMOFILES=3D"$GMOFILES $srcdirpre$lang.gmo" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS=3D - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=3Dno - if test "%UNSET%" !=3D "$LINGUAS"; then - desiredlanguages=3D"$LINGUAS" - else - desiredlanguages=3D"$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog= ). - case "$desiredlang" in - "$presentlang"*) useit=3Dyes;; - esac - done - if test $useit =3D yes; then - INST_LINGUAS=3D"$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS=3D - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS=3D"$CATALOGS $lang.gmo" - done - fi - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || = echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =3D/r $ac_dir/POTFILES" -e "/^# Makevars/r $a= c_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEP= OFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOF= ILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$PO= MAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do - if test -f "$f"; then - case "$f" in - *.orig | *.bak | *~) ;; - *) cat "$f" >> "$ac_dir/Makefile" ;; - esac - fi - done - fi - ;; - esac - done]], - [# Capture the value of obsolete ALL_LINGUAS because we need it to comp= ute - # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it - # from automake < 1.5. - eval 'OBSOLETE_ALL_LINGUAS''=3D"$ALL_LINGUAS"' - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS=3D"${LINGUAS-%UNSET%}" - ]) -]) - -dnl Postprocesses a Makefile in a directory containing PO files. -AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], -[ - # When this code is run, in config.status, two variables have already be= en - # set: - # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, - # - LINGUAS is the value of the environment variable LINGUAS at configure - # time. - -changequote(,)dnl - # Adjust a relative srcdir. - ac_dir=3D`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix=3D/`echo "$ac_dir"|sed 's%^\./%%'` - ac_dots=3D`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. - test -n "$ac_given_srcdir" || ac_given_srcdir=3D"$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=3D`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir=3D"$ac_given_srcdir" ;; - *) top_srcdir=3D"$ac_dots$ac_given_srcdir" ;; - esac - - # Find a way to echo strings without interpreting backslash. - if test "X`(echo '\t') 2>/dev/null`" =3D 'X\t'; then - gt_echo=3D'echo' - else - if test "X`(printf '%s\n' '\t') 2>/dev/null`" =3D 'X\t'; then - gt_echo=3D'printf %s\n' - else - echo_func () { - cat < "$ac_file.= tmp" - tab=3D`printf '\t'` - if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=3D`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNO= PQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - cat >> "$ac_file.tmp" < /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=3D`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e= 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e = 's/^uz-UZ$/uz-UZ-Latn/'` - cat >> "$ac_file.tmp" <> "$ac_file.tmp" <, 1996. - -AC_PREREQ(2.50) - -# Search path for a program which passes the given test. - -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN([AM_PATH_PROG_WITH_TEST], -[ -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" !=3D set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH=3D"/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=3D';' - else - PATH_SEPARATOR=3D: - fi - rm -f conf$$.sh -fi - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executabili= ty. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p=3D"test -x" -else - ac_executable_p=3D"test -f" -fi -rm -f conf$$.file - -# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=3D[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - [[\\/]]* | ?:[[\\/]]*) - ac_cv_path_$1=3D"[$]$1" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=3D"$IFS"; IFS=3D$PATH_SEPARATOR - for ac_dir in ifelse([$5], , $PATH, [$5]); do - IFS=3D"$ac_save_IFS" - test -z "$ac_dir" && ac_dir=3D. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD - if [$3]; then - ac_cv_path_$1=3D"$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS=3D"$ac_save_IFS" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1=3D"$4" -])dnl - ;; -esac])dnl -$1=3D"$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" !=3D "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) diff --git a/po/.gitignore b/po/.gitignore new file mode 100644 index 00000000..67b1779e --- /dev/null +++ b/po/.gitignore @@ -0,0 +1,18 @@ +/*.gmo +/*.pot +/Makefile.in.in +/Makevars.template +/POTFILES +/Rules-quot +/boldquot.sed +/en@boldquot.header +/en@boldquot.insert-header +/en@boldquot.po +/en@quot.header +/en@quot.insert-header +/en@quot.po +/insert-header.sin +/quot.sed +/remove-potcdate.sed +/remove-potcdate.sin +/stamp-po diff --git a/po/ChangeLog b/po/ChangeLog index 36d618a5..434859e8 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,5 +1,8 @@ 2020-12-15 Dmitry V. Levin =20 + * Makevars: Sync with Makevars.template. + * .gitignore: New file. + * fr.po: Remove empty translation file. * it.po: Likewise. * nl.po: Likewise. diff --git a/po/Makefile.in.in b/po/Makefile.in.in deleted file mode 100644 index fce63a6e..00000000 --- a/po/Makefile.in.in +++ /dev/null @@ -1,453 +0,0 @@ -# Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU General Public -# License but which still want to provide support for the GNU gettext -# functionality. -# 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.2 -GETTEXT_MACRO_VERSION =3D 0.18 - -PACKAGE =3D @PACKAGE@ -VERSION =3D @VERSION@ -PACKAGE_BUGREPORT =3D @PACKAGE_BUGREPORT@ - -SHELL =3D /bin/sh -@SET_MAKE@ - -srcdir =3D @srcdir@ -top_srcdir =3D @top_srcdir@ -VPATH =3D @srcdir@ - -prefix =3D @prefix@ -exec_prefix =3D @exec_prefix@ -datarootdir =3D @datarootdir@ -datadir =3D @datadir@ -localedir =3D @localedir@ -gettextsrcdir =3D $(datadir)/gettext/po - -INSTALL =3D @INSTALL@ -INSTALL_DATA =3D @INSTALL_DATA@ - -# We use $(mkdir_p). -# In automake <=3D 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or= as -# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, -# @install_sh@ does not start with $(SHELL), so we add it. -# In automake >=3D 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is de= fined -# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these autom= ake -# versions, $(mkinstalldirs) and $(install_sh) are unused. -mkinstalldirs =3D $(SHELL) @install_sh@ -d -install_sh =3D $(SHELL) @install_sh@ -MKDIR_P =3D @MKDIR_P@ -mkdir_p =3D @mkdir_p@ - -GMSGFMT_ =3D @GMSGFMT@ -GMSGFMT_no =3D @GMSGFMT@ -GMSGFMT_yes =3D @GMSGFMT_015@ -GMSGFMT =3D $(GMSGFMT_$(USE_MSGCTXT)) -MSGFMT_ =3D @MSGFMT@ -MSGFMT_no =3D @MSGFMT@ -MSGFMT_yes =3D @MSGFMT_015@ -MSGFMT =3D $(MSGFMT_$(USE_MSGCTXT)) -XGETTEXT_ =3D @XGETTEXT@ -XGETTEXT_no =3D @XGETTEXT@ -XGETTEXT_yes =3D @XGETTEXT_015@ -XGETTEXT =3D $(XGETTEXT_$(USE_MSGCTXT)) -MSGMERGE =3D msgmerge -MSGMERGE_UPDATE =3D @MSGMERGE@ --update -MSGINIT =3D msginit -MSGCONV =3D msgconv -MSGFILTER =3D msgfilter - -POFILES =3D @POFILES@ -GMOFILES =3D @GMOFILES@ -UPDATEPOFILES =3D @UPDATEPOFILES@ -DUMMYPOFILES =3D @DUMMYPOFILES@ -DISTFILES.common =3D Makefile.in.in remove-potcdate.sin \ -$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.e= xtra3) -DISTFILES =3D $(DISTFILES.common) Makevars POTFILES.in \ -$(POFILES) $(GMOFILES) \ -$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) - -POTFILES =3D \ - -CATALOGS =3D @CATALOGS@ - -# Makevars gets inserted here. (Don't remove this line!) - -.SUFFIXES: -.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update - -.po.mo: - @echo "$(MSGFMT) -c -o $@ $<"; \ - $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ - -.po.gmo: - @lang=3D`echo $* | sed -e 's,.*/,,'`; \ - test "$(srcdir)" =3D . && cdcmd=3D"" || cdcmd=3D"cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose= -o $${lang}.gmo $${lang}.po"; \ - cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbos= e -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo - -.sin.sed: - sed -e '/^#/d' $< > t-$@ - mv t-$@ $@ - - -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 =3D \ - test "$(GETTEXT_MACRO_VERSION)" =3D "@GETTEXT_MACRO_VERSION@" \ - || { echo "*** error: gettext infrastructure mismatch: using a Makefile= =2Ein.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf mac= ros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ - exit 1; \ - } - -# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds= no -# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (becau= se -# we don't want to bother translators with empty POT files). We assume that -# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. -# In this case, stamp-po is a nop (i.e. a phony target). - -# stamp-po is a timestamp denoting the last time at which the CATALOGS have -# been loosely updated. Its purpose is that when a developer or translator -# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, -# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent -# invocations of "make" will do nothing. This timestamp would not be neces= sary -# if updating the $(CATALOGS) would always touch them; however, the rule f= or -# $(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 || { \ - echo "touch stamp-po" && \ - echo timestamp > stamp-poT && \ - mv stamp-poT stamp-po; \ - } - -# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', -# otherwise packages like GCC can not be built if only parts of the source -# have been downloaded. - -# 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 { if (LC_ALL=3DC find --version) 2>/dev/null | grep GNU >/dev/null; th= en \ - LC_ALL=3DC find -L $(top_srcdir) -maxdepth 1 -type f -size -100000= 00c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \ - else \ - LC_ALL=3DC grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ - fi; \ - } | grep -v 'libtool:' >/dev/null; then \ - package_gnu=3D'GNU '; \ - else \ - package_gnu=3D''; \ - fi; \ - if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' =3D '@'= PACKAGE_BUGREPORT'@'; then \ - msgid_bugs_address=3D'$(MSGID_BUGS_ADDRESS)'; \ - else \ - msgid_bugs_address=3D'$(PACKAGE_BUGREPORT)'; \ - fi; \ - case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \ - $(XGETTEXT) --default-domain=3D$(DOMAIN) --directory=3D$(top_srcdir) \ - --add-comments=3DTRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_O= PTIONS@ \ - --files-from=3D$(srcdir)/POTFILES.in \ - --copyright-holder=3D'$(COPYRIGHT_HOLDER)' \ - --msgid-bugs-address=3D"$$msgid_bugs_address" \ - ;; \ - *) \ - $(XGETTEXT) --default-domain=3D$(DOMAIN) --directory=3D$(top_srcdir) \ - --add-comments=3DTRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_O= PTIONS@ \ - --files-from=3D$(srcdir)/POTFILES.in \ - --copyright-holder=3D'$(COPYRIGHT_HOLDER)' \ - --package-name=3D"$${package_gnu}@PACKAGE@" \ - --package-version=3D'@VERSION@' \ - --msgid-bugs-address=3D"$$msgid_bugs_address" \ - ;; \ - esac - test ! -f $(DOMAIN).po || { \ - if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po = && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ - if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ - rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ - else \ - rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ - mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ - fi; \ - else \ - mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ - fi; \ - } - -# This rule has no dependencies: we don't need to update $(DOMAIN).pot at -# every "make" invocation, only create it when it is missing. -# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. -$(srcdir)/$(DOMAIN).pot: - $(MAKE) $(DOMAIN).pot-update - -# This target rebuilds a PO file if $(DOMAIN).pot has changed. -# Note that a PO file is not touched if it doesn't need to be changed. -$(POFILES): $(srcdir)/$(DOMAIN).pot - @lang=3D`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ - if test -f "$(srcdir)/$${lang}.po"; then \ - test "$(srcdir)" =3D . && cdcmd=3D"" || cdcmd=3D"cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=3D$${lang}= $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir) \ - && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*= ,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN)= =2Epot;; \ - *) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=3D$${lang} $${= lang}.po $(DOMAIN).pot;; \ - esac; \ - }; \ - else \ - $(MAKE) $${lang}.po-create; \ - fi - - -install: install-exec install-data -install-exec: -install-data: install-data-@USE_NLS@ - if test "$(PACKAGE)" =3D "gettext-tools"; then \ - $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ - for file in $(DISTFILES.common) Makevars.template; do \ - $(INSTALL_DATA) $(srcdir)/$$file \ - $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - for file in Makevars; do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - else \ - : ; \ - fi -install-data-no: all -install-data-yes: all - @catalogs=3D'$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=3D`basename $$cat`; \ - lang=3D`echo $$cat | sed -e 's/\.gmo$$//'`; \ - dir=3D$(localedir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $(DESTDIR)$$dir; \ - if test -r $$cat; then realcat=3D$$cat; else realcat=3D$(srcdir)/$$cat;= fi; \ - $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ - echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ - for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ - if test -n "$$lc"; then \ - if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=3DC ls -l -d $$lc 2>= /dev/null) | grep ' -> ' >/dev/null; then \ - link=3D`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=3DC ls -l -d $= $lc | sed -e 's/^.* -> //'`; \ - mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$la= ng/$$lc.old; \ - mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ - (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ - for file in *; do \ - if test -f $$file; then \ - ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$= file; \ - fi; \ - done); \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ - else \ - if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ - :; \ - else \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ - mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ - fi; \ - fi; \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ - ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$l= c/$(DOMAIN).mo 2>/dev/null || \ - ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR= )$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ - cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DEST= DIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ - echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$= lc/$(DOMAIN).mo"; \ - fi; \ - done; \ - done - -install-strip: install - -installdirs: installdirs-exec installdirs-data -installdirs-exec: -installdirs-data: installdirs-data-@USE_NLS@ - if test "$(PACKAGE)" =3D "gettext-tools"; then \ - $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ - else \ - : ; \ - fi -installdirs-data-no: -installdirs-data-yes: - @catalogs=3D'$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=3D`basename $$cat`; \ - lang=3D`echo $$cat | sed -e 's/\.gmo$$//'`; \ - dir=3D$(localedir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $(DESTDIR)$$dir; \ - for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ - if test -n "$$lc"; then \ - if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=3DC ls -l -d $$lc 2>= /dev/null) | grep ' -> ' >/dev/null; then \ - link=3D`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=3DC ls -l -d $= $lc | sed -e 's/^.* -> //'`; \ - mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$la= ng/$$lc.old; \ - mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ - (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ - for file in *; do \ - if test -f $$file; then \ - ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$= file; \ - fi; \ - done); \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ - else \ - if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ - :; \ - else \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ - mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ - fi; \ - fi; \ - fi; \ - done; \ - done - -# Define this as empty until I found a useful application. -installcheck: - -uninstall: uninstall-exec uninstall-data -uninstall-exec: -uninstall-data: uninstall-data-@USE_NLS@ - if test "$(PACKAGE)" =3D "gettext-tools"; then \ - for file in $(DISTFILES.common) Makevars.template; do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - else \ - : ; \ - fi -uninstall-data-no: -uninstall-data-yes: - catalogs=3D'$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=3D`basename $$cat`; \ - lang=3D`echo $$cat | sed -e 's/\.gmo$$//'`; \ - for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ - done; \ - done - -check: all - -info dvi ps pdf html tags TAGS ctags CTAGS ID: - -mostlyclean: - rm -f remove-potcdate.sed - rm -f stamp-poT - rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po - rm -fr *.o - -clean: mostlyclean - -distclean: clean - rm -f Makefile Makefile.in POTFILES *.mo - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - rm -f stamp-po $(GMOFILES) - -distdir =3D $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: - $(MAKE) update-po - @$(MAKE) dist2 -# This is a separate target because 'update-po' must be executed before. -dist2: stamp-po $(DISTFILES) - dists=3D"$(DISTFILES)"; \ - if test "$(PACKAGE)" =3D "gettext-tools"; then \ - dists=3D"$$dists Makevars.template"; \ - fi; \ - if test -f $(srcdir)/$(DOMAIN).pot; then \ - dists=3D"$$dists $(DOMAIN).pot stamp-po"; \ - fi; \ - if test -f $(srcdir)/ChangeLog; then \ - dists=3D"$$dists ChangeLog"; \ - fi; \ - for i in 0 1 2 3 4 5 6 7 8 9; do \ - if test -f $(srcdir)/ChangeLog.$$i; then \ - dists=3D"$$dists ChangeLog.$$i"; \ - fi; \ - done; \ - if test -f $(srcdir)/LINGUAS; then dists=3D"$$dists LINGUAS"; fi; \ - for file in $$dists; do \ - if test -f $$file; then \ - cp -p $$file $(distdir) || exit 1; \ - else \ - cp -p $(srcdir)/$$file $(distdir) || exit 1; \ - fi; \ - done - -update-po: Makefile - $(MAKE) $(DOMAIN).pot-update - test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) - $(MAKE) update-gmo - -# General rule for creating PO files. - -.nop.po-create: - @lang=3D`echo $@ | sed -e 's/\.po-create$$//'`; \ - echo "File $$lang.po does not exist. If you are a translator, you can cre= ate it through 'msginit'." 1>&2; \ - exit 1 - -# General rule for updating PO files. - -.nop.po-update: - @lang=3D`echo $@ | sed -e 's/\.po-update$$//'`; \ - if test "$(PACKAGE)" =3D "gettext-tools"; then PATH=3D`pwd`/../src:$$PATH= ; fi; \ - tmpdir=3D`pwd`; \ - echo "$$lang:"; \ - test "$(srcdir)" =3D . && cdcmd=3D"" || cdcmd=3D"cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=3D$$lang $$lang.po = $(DOMAIN).pot -o $$lang.new.po"; \ - cd $(srcdir); \ - if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang= =2Epo $(DOMAIN).pot;; \ - *) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=3D$$lang -o $$tmpdir/$$la= ng.new.po $$lang.po $(DOMAIN).pot;; \ - esac; \ - }; then \ - if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.ne= w.po to $$lang.po" 1>&2; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "msgmerge for $$lang.po failed!" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi - -$(DUMMYPOFILES): - -update-gmo: Makefile $(GMOFILES) - @: - -# Recreate Makefile by invoking config.status. Explicitly invoke the shell, -# because execution permission bits may not work on the current file syste= m. -# Use @SHELL@, which is the shell determined by autoconf for the use by its -# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. -Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFIL= EDEPS@ - cd $(top_builddir) \ - && @SHELL@ ./config.status $(subdir)/$@.in po-directories - -force: - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/po/Makevars b/po/Makevars index 0afcf4ea..086de588 100644 --- a/po/Makevars +++ b/po/Makevars @@ -41,3 +41,27 @@ MSGID_BUGS_ADDRESS =3D https://sourceware.org/bugzilla/ # 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 =3D + +# This tells whether the $(DOMAIN).pot file contains messages with an 'msg= ctxt' +# 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 =3D no + +# These options get passed to msgmerge. +# Useful options are in particular: +# --previous to keep previous msgids of translated messages, +# --quiet to reduce the verbosity. +MSGMERGE_OPTIONS =3D + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT =3D yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO =3D yes diff --git a/po/Rules-quot b/po/Rules-quot deleted file mode 100644 index 9c2a995e..00000000 --- a/po/Rules-quot +++ /dev/null @@ -1,47 +0,0 @@ -# Special Makefile rules for English message catalogs with quotation marks. - -DISTFILES.common.extra1 =3D quot.sed boldquot.sed en@quot.header en@boldqu= ot.header insert-header.sin Rules-quot - -.SUFFIXES: .insert-header .po-update-en - -en@quot.po-create: - $(MAKE) en@quot.po-update -en@boldquot.po-create: - $(MAKE) en@boldquot.po-update - -en@quot.po-update: en@quot.po-update-en -en@boldquot.po-update: en@boldquot.po-update-en - -.insert-header.po-update-en: - @lang=3D`echo $@ | sed -e 's/\.po-update-en$$//'`; \ - if test "$(PACKAGE)" =3D "gettext"; then PATH=3D`pwd`/../src:$$PATH; GETT= EXTLIBDIR=3D`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ - tmpdir=3D`pwd`; \ - echo "$$lang:"; \ - ll=3D`echo $$lang | sed -e 's/@.*//'`; \ - LC_ALL=3DC; export LC_ALL; \ - cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -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.n= ew.po; then \ - if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new= =2Epo to $$lang.po" 1>&2; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "creation of $$lang.po failed!" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi - -en@quot.insert-header: insert-header.sin - sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin= > en@quot.insert-header - -en@boldquot.insert-header: insert-header.sin - sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header= =2Esin > en@boldquot.insert-header - -mostlyclean: mostlyclean-quot -mostlyclean-quot: - rm -f *.insert-header diff --git a/po/boldquot.sed b/po/boldquot.sed deleted file mode 100644 index 4b937aa5..00000000 --- a/po/boldquot.sed +++ /dev/null @@ -1,10 +0,0 @@ -s/"\([^"]*\)"/=E2=80=9C\1=E2=80=9D/g -s/`\([^`']*\)'/=E2=80=98\1=E2=80=99/g -s/ '\([^`']*\)' / =E2=80=98\1=E2=80=99 /g -s/ '\([^`']*\)'$/ =E2=80=98\1=E2=80=99/g -s/^'\([^`']*\)' /=E2=80=98\1=E2=80=99 /g -s/=E2=80=9C=E2=80=9D/""/g -s/=E2=80=9C/=E2=80=9C=1B[1m/g -s/=E2=80=9D/=1B[0m=E2=80=9D/g -s/=E2=80=98/=E2=80=98=1B[1m/g -s/=E2=80=99/=1B[0m=E2=80=99/g diff --git a/po/en@boldquot.header b/po/en@boldquot.header deleted file mode 100644 index fedb6a06..00000000 --- a/po/en@boldquot.header +++ /dev/null @@ -1,25 +0,0 @@ -# All this catalog "translates" are quotation characters. -# The msgids must be ASCII and therefore cannot contain real quotation -# characters, only substitutes like grave accent (0x60), apostrophe (0x27) -# and double quote (0x22). These substitutes look strange; see -# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html -# -# This catalog translates grave accent (0x60) and apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2= 019). -# It also translates pairs of apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2= 019) -# and pairs of quotation mark (0x22) to -# left double quotation mark (U+201C) and right double quotation mark (U+2= 01D). -# -# When output to an UTF-8 terminal, the quotation characters appear perfec= tly. -# When output to an ISO-8859-1 terminal, the single quotation marks are -# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to -# grave/acute accent (by libiconv), and the double quotation marks are -# transliterated to 0x22. -# When output to an ASCII terminal, the single quotation marks are -# transliterated to apostrophes, and the double quotation marks are -# transliterated to 0x22. -# -# This catalog furthermore displays the text between the quotation marks in -# bold face, assuming the VT100/XTerm escape sequences. -# diff --git a/po/en@quot.header b/po/en@quot.header deleted file mode 100644 index a9647fc3..00000000 --- a/po/en@quot.header +++ /dev/null @@ -1,22 +0,0 @@ -# All this catalog "translates" are quotation characters. -# The msgids must be ASCII and therefore cannot contain real quotation -# characters, only substitutes like grave accent (0x60), apostrophe (0x27) -# and double quote (0x22). These substitutes look strange; see -# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html -# -# This catalog translates grave accent (0x60) and apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2= 019). -# It also translates pairs of apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2= 019) -# and pairs of quotation mark (0x22) to -# left double quotation mark (U+201C) and right double quotation mark (U+2= 01D). -# -# When output to an UTF-8 terminal, the quotation characters appear perfec= tly. -# When output to an ISO-8859-1 terminal, the single quotation marks are -# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to -# grave/acute accent (by libiconv), and the double quotation marks are -# transliterated to 0x22. -# When output to an ASCII terminal, the single quotation marks are -# transliterated to apostrophes, and the double quotation marks are -# transliterated to 0x22. -# diff --git a/po/insert-header.sin b/po/insert-header.sin deleted file mode 100644 index b26de01f..00000000 --- a/po/insert-header.sin +++ /dev/null @@ -1,23 +0,0 @@ -# Sed script that inserts the file called HEADER before the header entry. -# -# At each occurrence of a line starting with "msgid ", we execute the foll= owing -# commands. At the first occurrence, insert the file. At the following -# occurrences, do nothing. The distinction between the first and the follo= wing -# occurrences is achieved by looking at the hold space. -/^msgid /{ -x -# Test if the hold space is empty. -s/m/m/ -ta -# Yes it was empty. First occurrence. Read the file. -r HEADER -# Output the file's contents by reading the next line. But don't lose the -# current line while doing this. -g -N -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/quot.sed b/po/quot.sed deleted file mode 100644 index 0122c463..00000000 --- a/po/quot.sed +++ /dev/null @@ -1,6 +0,0 @@ -s/"\([^"]*\)"/=E2=80=9C\1=E2=80=9D/g -s/`\([^`']*\)'/=E2=80=98\1=E2=80=99/g -s/ '\([^`']*\)' / =E2=80=98\1=E2=80=99 /g -s/ '\([^`']*\)'$/ =E2=80=98\1=E2=80=99/g -s/^'\([^`']*\)' /=E2=80=98\1=E2=80=99 /g -s/=E2=80=9C=E2=80=9D/""/g diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin deleted file mode 100644 index 2436c49e..00000000 --- a/po/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} --=20 ldv