From caa52c10c577ddf4507d6db6f92085806bc848fb Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 26 May 2004 19:25:21 +0000
Subject: [PATCH 1/1] * configure.ac (AM_GNU_GETTEXT_VERSION): Lower it from
 0.14.1 to 0.11.5. * bootstrap: Remove gettext version checking.

---
 ChangeLog    | 10 ++++++++++
 bootstrap    | 26 --------------------------
 configure.ac |  2 +-
 3 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed694198..e536978e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-05-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* configure.ac (AM_GNU_GETTEXT_VERSION): Lower it from 0.14.1 to
+	0.11.5.  Suggested by Bruno Haible.
+	* bootstrap: Remove gettext version checking.
+
+	* doc/bison.texinfo (Decl Summary): Also mention that %union
+	can depend on prerequisite types.  Problem reported by Tim
+	Van Holder.
+
 2004-05-25  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* README: Mention GNU m4 1.4 bugs and Akim's patched version.
diff --git a/bootstrap b/bootstrap
index dcea122b..c9a2303b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -43,32 +43,6 @@ do
   esac
 done
 
-# Check that gettext version matches what's in configure.ac.
-# FIXME: We shouldn't have to modify configure.ac every time
-# a new gettext version comes out.
-{
-  gettext_version_output=`LC_ALL=C gettext --version` &&
-  case $gettext_version_output in
-  'gettext (GNU '*) ;;
-  *) false;;
-  esac
-} || {
-  echo >&2 "$0: Please install GNU gettext first."
-  exit 1
-}
-newline='
-'
-last_word_in_first_line="[^$newline]* \\([^$newline]*\\)"
-gettext_have=`expr "$gettext_version_output" : "$last_word_in_first_line"`
-gettext_need=`
-  sed -n '/^AM_GNU_GETTEXT_VERSION/{ s/.*\[//; s/].*//; p; q; }' configure.ac
-`
-[ "$gettext_have" = "$gettext_need" ] || {
-  echo >&2 "$0: Your gettext version is $gettext_have."
-  echo >&2 "$0: Please install and use gettext-$gettext_need instead."
-  exit 1
-}
-
 echo "$0: Bootstrapping CVS $package..."
 
 build_cvs_prefix() {
diff --git a/configure.ac b/configure.ac
index 866edfe6..1160621b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,7 +103,7 @@ BISON_PREREQ_TIMEVAR
 
 # gnulib and gettext.
 GNULIB_AUTOCONF_SNIPPET
-AM_GNU_GETTEXT_VERSION([0.14.1])
+AM_GNU_GETTEXT_VERSION([0.11.5])
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
-- 
2.47.2