diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2019-09-01 11:20:48 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2019-09-01 11:22:04 +0200 |
| commit | b5c00e80189fd59a059a95c4e276728a2492cb89 (patch) | |
| tree | a35fbee07fd398704a2deb83360c5e39e4721fd9 | |
| parent | f6394278664b19210823d27e9c04d363f38bd33d (diff) | |
| download | zeitgeist-b5c00e80189fd59a059a95c4e276728a2492cb89.tar.gz | |
build: Allow building with gettext ≥ 0.20
The use of AM_GNU_GETTEXT_VERSION in configure.ac instructs autopoint to
copy po/Makefile.in.in from the exact gettext version. It is fine if the
version of gettext installed on the system has the same minor version
number with the requested version, but it fails if you have a newer
version of gettext because of the mismatch between autoconf macros and
Makefile.in.in.
*** error: gettext infrastructure mismatch: using a Makefile.in.in
from gettext version 0.19 but the autoconf macros are from gettext
version 0.20
Instead of specifying the exact version with AM_GNU_GETTEXT_VERSION, we
can use AM_GNU_GETTEXT_REQUIRE_VERSION to ask autopoint to simply use
the gettext version installed on the system to prevent the mismatch.
This also bumps the version requirement on gettext to 0.19.6 because
AM_GNU_GETTEXT_REQUIRE_VERSION was added in this version.
Fixes https://gitlab.freedesktop.org/zeitgeist/zeitgeist/issues/18
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 14d8efa1..cdc48e01 100644 --- a/configure.ac +++ b/configure.ac @@ -31,8 +31,11 @@ AM_SILENT_RULES([yes]) GETTEXT_PACKAGE=AC_PACKAGE_NAME AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used]) -AM_GNU_GETTEXT_VERSION([0.19]) + AM_GNU_GETTEXT([external]) +# FIXME: Remove AM_GNU_GETTEXT_VERSION once autoreconf supports REQUIRE_VERSION +AM_GNU_GETTEXT_VERSION([0.19.6]) +AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6]) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) |