summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2010-12-30 13:08:32 -0700
committerEric Blake <eblake@redhat.com>2010-12-30 15:10:09 -0700
commit278491d2cc3238b32a82a9460a0153607105d50d (patch)
treefef7e9ac9933923e8bb1a1714745471701d813f3
parent44dbcae6b98700617d4d3cb8d799ce83d538e3e7 (diff)
downloadcoreutils-278491d2cc3238b32a82a9460a0153607105d50d.tar.xz
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.
-rw-r--r--bootstrap.conf2
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap.conf b/bootstrap.conf
index dc4b5b29f..5a375d9a5 100644
--- 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 71018478f..115b7e02f 100644
--- 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