From 0fd23dd1855702fa2b4b8ba97f9a5497ecde7b5b Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan Date: Wed, 24 Jul 2019 17:01:39 +0800 Subject: [PATCH] =?UTF-8?q?Allow=20building=20with=20gettext=20=E2=89=A5?= =?UTF-8?q?=200.20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 472f44b4..712b787c 100644 --- a/configure.ac +++ b/configure.ac @@ -215,7 +215,9 @@ AC_TYPE_SIGNAL AC_FUNC_STRFTIME AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname) -AM_GNU_GETTEXT_VERSION([0.19.4]) +# 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]) AM_GNU_GETTEXT([external]) GETTEXT_PACKAGE=libgtop-2.0