aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2021-03-02 12:25:41 +0100
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2021-03-02 12:25:41 +0100
commitdb8039584d0112aeb520bb7f33181fc824e77ba8 (patch)
treeb3a6e80582ffdfd7ff1ad53b06852148ec31a768
parentcbbb3ee34ee7ad3bceec7b6a69547d464cc9bee0 (diff)
configure.ac: improve gettext compatibility support
Gettext 0.19.8 wants to see AM_GNU_GETTEXT_VERSION, but gettext 0.21 wants AM_GNU_GETTEXT_REQUIRE_VERSION. Test if AM_GNU_GETTEXT_REQUIRE_VERSION is supported and use that, otherwise fall back to AM_GNU_GETTEXT_VERSION. This also prevents gettextize from overwriting configure.ac with an updated AM_GNU_GETTEXT_VERSION version number, which was really annoying since configure.ac is under version control. Tested with both gettext versions. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Suggested-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 5290fa01..727730c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,7 @@ PKG_PROG_PKG_CONFIG
DX_DOT_FEATURE(ON)
DX_INIT_DOXYGEN($PACKAGE_NAME, doxygen_libdvbv5.cfg)
ALL_LINGUAS=""
-AM_GNU_GETTEXT_VERSION([0.19.8])
+m4_ifdef(AM_GNU_GETTEXT_REQUIRE_VERSION,[AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])],[AM_GNU_GETTEXT_VERSION([0.19.8])])
AM_GNU_GETTEXT([external])
LIBDVBV5_DOMAIN="libdvbv5"

Privacy Policy