Re: gettext version-numbering problems in Bison (+ Bison patch)

[Paul Eggert]

Paul Hilfinger reported that my workaround to the gettext problem
didn't work either, as autopoint prints out the very-puzzling message

configure.ac:105: required file `./ABOUT-NLS' not found

because there's no gettext version number in configure.ac.
(The workaround did work for me in my source tree, but perhaps this
was due to old files lying around.)

I'm tempted to modify 'bootstrap' to invoke 'gettext --version' and
put the resulting number into configure.ac, but for now I installed
the following patch instead.

2004-05-24  Paul Eggert  <address@hidden>

        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.

Index: bootstrap
===================================================================
RCS file: /cvsroot/bison/bison/bootstrap,v
retrieving revision 1.9
diff -p -u -r1.9 bootstrap
--- bootstrap   24 May 2004 20:08:53 -0000      1.9
+++ bootstrap   25 May 2004 05:37:59 -0000
@@ -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
 
Index: configure.ac
===================================================================
RCS file: /cvsroot/bison/bison/configure.ac,v
retrieving revision 1.43
diff -p -u -r1.43 configure.ac
--- configure.ac        24 May 2004 20:08:54 -0000      1.43
+++ configure.ac        25 May 2004 05:37:59 -0000
@@ -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)