diff options
| author | Martin Blanchard <tchaik@gmx.com> | 2021-03-31 09:52:03 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2022-06-27 13:40:09 +0200 |
| commit | 19a6affd3ad40ce7fd7ca6201f20ddd89e99949a (patch) | |
| tree | b7d1b8bd45c4cb8377f439e55158d133a7f4e3ae /.gitignore | |
| parent | bf9a2babb47caa11e13a2268ad88943812f83634 (diff) | |
| download | NetworkManager-19a6affd3ad40ce7fd7ca6201f20ddd89e99949a.tar.gz | |
build: stop relying on intltool for i18n
Recent gettext version can extract and merge back strings from and to
various file formats, no need for intltool anymore.
https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/133
https://github.com/NetworkManager/NetworkManager/pull/303
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/96
Clarification about the use of AM_GNU_GETTEXT_REQUIRE_VERSION:
In configure.ac, specify the minimum gettext version we require, rather
than the exact one. This fixes a situation where the autoconf macros
used for gettext will be the latest available on the system (for
example, 0.20); but the copied-in Makefile.in.in will be for the exact
version specified in configure.ac (in this case, 0.19).
In that situation, the gettext build rules will error out at `make` time
with the message:
*** error: gettext infrastructure mismatch: using a Makefile.in.in
from gettext version 0.19 but the autoconf macros are from gettext
version 0.20
Avoid that by specifying a minimum version dependency rather than an
exact one. This should not cause problems as we haven’t committed any
generated or external gettext files into git, so each developer will end
up regenerating the build system for their system’s version of gettext,
as expected.
See the subsection of
https://www.gnu.org/software/gettext/manual/html_node/Version-Control-Issues.html
for more information.
Note that autoreconf currently doesn’t recognise
AM_GNU_GETTEXT_REQUIRE_VERSION, so we must continue also using
AM_GNU_GETTEXT_VERSION. autopoint will ignore the latter if the former
is present. See
https://lists.gnu.org/archive/html/autoconf-patches/2015-10/msg00000.html.
[lkundrak@v3.sk: Fixed the meson build, adjusted autogen.sh:
droped "|| exit 1", dropped call to aclocal,
dropped --copy from gtkdocize.]
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 34d5af178f..4b92085496 100644 --- a/.gitignore +++ b/.gitignore @@ -55,7 +55,6 @@ test-*.trs /config.* /config-extra.h /configure -/intltool-* /confdefs.h /conftest.[ch] @@ -192,7 +191,6 @@ test-*.trs /m4/intl.m4 /m4/intldir.m4 /m4/intlmacosx.m4 -/m4/intltool.m4 /m4/intmax.m4 /m4/inttypes-pri.m4 /m4/inttypes_h.m4 @@ -226,7 +224,6 @@ test-*.trs /man/common.ent /po/*.gmo -/po/.intltool-merge-cache /po/NetworkManager.pot /po/Makevars.template /po/Rules-quot @@ -483,3 +480,6 @@ test-*.trs /src/tests/test-systemd /src/tests/test-utils /src/tests/test-wired-defname +/intltool-* +/m4/intltool.m4 +/po/.intltool-merge-cache |