[Reproducible-commits] [dpkg] 27/54: build: Try to use latest gettext available

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 77337a8b0f6f789d79032486157f6d9260c2c53e
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Nov 15 15:44:16 2015 +0100

    build: Try to use latest gettext available
    
    Using AM_GNU_GETTEXT_REQUIRE_VERSION specifies the minimal required
    gettext version, but tries to use tha latest supported version
    available on the system, so we can take advantage of any fixes and
    improvements.
    
    We cannot remove AM_GNU_GETTEXT_VERSION() for backwards compatibility
    reasons, otherwise older autopoint and autoreconf versions would not
    be able to know what is the minimal required gettext versions.
---
 configure.ac     | 8 ++++++++
 debian/changelog | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/configure.ac b/configure.ac
index adb760a..a6ff1ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,14 @@ AC_USE_SYSTEM_EXTENSIONS
 AM_INIT_AUTOMAKE([1.11 -Wall foreign nostdinc no-dist-gzip dist-xz])
 AM_SILENT_RULES([yes])
 
+# Do not unconditionally use the following macro, as Debian jessie does not
+# have a recent enough gettext.
+m4_ifdef([AM_GNU_GETTEXT_REQUIRE_VERSION],
+         [AM_GNU_GETTEXT_REQUIRE_VERSION([0.19])])
+# We cannot remove the following macro due to backwards compatibility reasons.
+# In the future when the gettext version is bumped, we have to set the above
+# macro unconditionally to the minimal version, and set the below to 0.19.6,
+# the first version introducing the AM_GNU_GETTEXT_REQUIRE_VERSION macro.
 AM_GNU_GETTEXT_VERSION([0.19])
 AM_GNU_GETTEXT([external])
 DPKG_DIST_CHECK([test "$GMSGFMT" = ":" && test "$USE_NLS" = "yes"],
diff --git a/debian/changelog b/debian/changelog
index b286ac8..a2f858c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ dpkg (1.18.4) UNRELEASED; urgency=low
     - Descend into scripts directory when cleaning up code coverage files.
     - Add new configure option --disable-devel-docs to select the kind of docs
       to generate, default for now is development documentation.
+    - Try to use AM_GNU_GETTEXT_REQUIRE_VERSION to benefit from the latest
+      installed gettext version, while guaranteeing a minimal required version.
   * Documentation:
     - Move description for “target architecture” from the dpkg-architecture(1)
       ‘-A’ option to the TERMS section. Closes: #799046

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git