* configure.ac (AM_GNU_GETTEXT_VERSION): Lower it from 0.14.1 to 0.11.5.

* bootstrap: Remove gettext version checking.

diff --git a/ChangeLog b/ChangeLog
index ed694198a9b5d3cbec9cad0e05ed34535127731c..e536978e2df96085c8afc3cf2d047b6fa58b034e 100644 (file)
--- 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 dcea122b827d8efe1b17e345c96e8f27a1587f67..c9a2303bcda47b57e188ffc717a5f583e044d40c 100755 (executable)
--- 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 866edfe6c2c9ee9e4ba40f3d9bd140d498826e77..1160621bb45a00f62cd4072e91573324e662198f 100644 (file)
--- 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)