[coreutils] [PATCH] maint: allow gettext 0.17 again

2010-12-30 Thread Eric Blake
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.

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

I need this patch in order to bootstrap on cygwin (at the moment, all
versions of gettext 0.18 are unbuildable on cygwin, due to problems
between gcc's need for implicit symbol imports from libgcc1
vs. Bruno's explicit avoidance of implicit symbols in gettext).

 bootstrap.conf |2 +-
 configure.ac   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index dc4b5b2..5a375d9 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -311,7 +311,7 @@ autoconf   2.62
 automake   1.11.1
 autopoint  -
 bison  -
-gettext0.18
+gettext0.17
 git1.4.4
 gperf  -
 gzip   -
diff --git a/configure.ac b/configure.ac
index 7101847..115b7e0 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
-- 
1.7.3.4




Re: [coreutils] [PATCH] maint: allow gettext 0.17 again

2010-12-30 Thread Jim Meyering
Eric Blake wrote:
 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.

IMHO, we should do our best to make 0.18 work as a build-from-clone
(not build from tarball) condition.
However, since you say that 0.18.x still does not build on cygwin,
relaxing that requirement to 0.17 makes it easier for more than a
few people to build coreutils, and I won't object.

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

 I need this patch in order to bootstrap on cygwin (at the moment, all
 versions of gettext 0.18 are unbuildable on cygwin, due to problems
 between gcc's need for implicit symbol imports from libgcc1
 vs. Bruno's explicit avoidance of implicit symbols in gettext).

I confirmed that this works for me, with 0.18.1,
so you're welcome to push it.