maint: allow gettext 0.17 again

Commit 041c9c47 traded the 'gettext' module for the lighter 'gettext-h'
module, so as to not require the latest gettext release (we only need
the latest release if we ship gettext as a dependent library, but
coreutils has long preferred to use it as an external library).
But that commit overlooked two places necessary to allow the use of
gettext 0.17.

This does not force you to downgrade (using gettext 0.18.1.1 is still
just fine), nor does it affect tarballs (once a tarball is built
with a given gettext version, it can be built on other machines
regardless of what gettext version is present).

* bootstrap.conf (buildreq): Relax prerequisite.
* configure.ac (AM_GNU_GETTEXT_VERSION): Likewise.

diff --git a/bootstrap.conf b/bootstrap.conf
index dc4b5b29fabe9e6057949469b1187da227199212..5a375d9a567a7e99ad2a8e98f279bce5cc9453da 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -311,7 +311,7 @@ autoconf   2.62
 automake   1.11.1
 autopoint  -
 bison      -
-gettext    0.18
+gettext    0.17
 git        1.4.4
 gperf      -
 gzip       -

diff --git a/configure.ac b/configure.ac
index 71018478fae6119eb7850ee16ae180639e0b5133..115b7e02feb0e03da8cf599d934725c7e30d022a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -443,7 +443,7 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES])
 # As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in
 # translatable strings, we must use need-formatstring-macros here.
 AM_GNU_GETTEXT([external], [need-formatstring-macros])
-AM_GNU_GETTEXT_VERSION([0.18])
+AM_GNU_GETTEXT_VERSION([0.17])
 
 # For a test of uniq: it uses the $LOCALE_FR envvar.
 gt_LOCALE_FR