Undo change made earlier today: it caused autopoint to not bring

in ABOUT-NLS.  Ouch.  Instead, substitute our own diagnostic for
autopoint's.

diff --git a/ChangeLog b/ChangeLog
index 5f72dca9f333d6218cb44344b27bd33371f698bf..861e4c634a14288ad04b4bffd3459c859b20cfa1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2004-05-24  Paul Eggert  <eggert@cs.ucla.edu>
 
+       Undo change made earlier today: it caused autopoint to not bring
+       in ABOUT-NLS.  Ouch.  Instead, substitute our own diagnostic for
+       autopoint's.
+
+       * bootstrap: Check that gettext version matches what's in
+       configure.ac.  Warn users to ignore robots.txt ERROR 404.
+       * bootstrap: Undo today's earlier change (logged below).
+       * configure.ac (AM_GNU_GETTEXT_VERSION): Likewise.
+       
        The gettext version checking is causing more trouble than it's
        curing; remove it.  Problem reported by Paul Hilfinger.
 

diff --git a/bootstrap b/bootstrap
index d1f48516bfc414779bb4bdfdff9d99f34368b355..34dce9d445c35634e3d4468499a8548c2521c15a 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -43,6 +43,19 @@ 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_have=$(LC_ALL=C gettext --version | sed 's/.* //; 1q')
+gettext_need=$(
+  sed -n '/^AM_GNU_GETTEXT_VERSION/{ s/.*\[//; s/].*//; p; q; }' configure.ac
+)
+test "$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() {
@@ -141,7 +154,7 @@ done
 
 case $SKIP_PO in
 '')
-  echo "$0: getting translations into po..."
+  echo "$0: getting translations into po (please ignore the robots.txt ERROR 404)..."
   (cd po &&
    rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'` &&
    wget -nv -nd -r -l 1 -A .po -C off \
@@ -166,7 +179,6 @@ esac
 
 # Reconfigure, getting other files.
 
-echo "$0: Expect an 'AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION' warning"
 echo "$0: autoreconf --verbose --install --force ..."
 autoreconf --verbose --install --force || exit
 

diff --git a/configure.ac b/configure.ac
index f7b42501bd8c56b4c20d4b2c74ce1124b48aa686..866edfe6c2c9ee9e4ba40f3d9bd140d498826e77 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,7 @@ BISON_PREREQ_TIMEVAR
 
 # gnulib and gettext.
 GNULIB_AUTOCONF_SNIPPET
+AM_GNU_GETTEXT_VERSION([0.14.1])
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)