aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2020-02-15 03:08:32 +0200
committerLasse Collin <lasse.collin@tukaani.org>2020-03-11 12:05:57 +0200
commitbd09081bbdf552f730030d2fd0e5e39ccb3936af (patch)
treea9b6723e1e91f99017f49de8edf3eee73b8c5f70
parent1e5e08d86534aec7ca957982c7f6e90203c19e9f (diff)
downloadxz-bd09081bbdf552f730030d2fd0e5e39ccb3936af.tar.gz
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.
-rw-r--r--configure.ac6
1 files changed, 5 insertions, 1 deletions
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])