From 3d576cf92158d62790017ad7f2dd6dc1dd6b42bb Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Sat, 15 Feb 2020 03:08:32 +0200 Subject: [PATCH] Build: Use AM_GNU_GETTEXT_REQUIRE_VERSION and require 0.19.6. This bumps the version requirement from 0.19 (from 2014) to 0.19.6 (2015). Using only the old AM_GNU_GETTEXT_VERSION results in old gettext infrastructure being placed in the package. By using both macros we get the latest gettext files while the other programs in the Autotools family can still see the old macro. --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c8f76e43..0915afc3 100644 --- a/configure.ac +++ b/configure.ac @@ -643,9 +643,13 @@ AM_CONDITIONAL([COND_SHARED], [test "x$enable_shared" != xno]) # Checks for libraries. ############################################################################### +dnl Support for _REQUIRE_VERSION was added in gettext 0.19.6. If both +dnl _REQUIRE_VERSION and _VERSION are present, the _VERSION is ignored. +dnl We use both for compatibility with other programs in the Autotools family. echo echo "Initializing gettext:" -AM_GNU_GETTEXT_VERSION([0.19]) +AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6]) +AM_GNU_GETTEXT_VERSION([0.19.6]) AM_GNU_GETTEXT([external])