(b4_symbol_actions): Don't assume %union was used.

[bison.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index 34dce9d445c35634e3d4468499a8548c2521c15a..c9a2303bcda47b57e188ffc717a5f583e044d40c 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -43,19 +43,6 @@ do
   esac
 done
 
   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() {
 echo "$0: Bootstrapping CVS $package..."
 
 build_cvs_prefix() {


@@ -223,7 +210,7 @@ mv m4/gettext.m4t m4/gettext.m4 || exit
 # remove this once the bug is fixed.
 grep @top_builddir@ po/Makefile.in.in >/dev/null || {
   echo "$0: prepending 'top_builddir=@top_builddir@' to po/Makefile.in.in ... "
 # remove this once the bug is fixed.
 grep @top_builddir@ po/Makefile.in.in >/dev/null || {
   echo "$0: prepending 'top_builddir=@top_builddir@' to po/Makefile.in.in ... "

-  old_contents=$(cat po/Makefile.in.in) || exit
+  old_contents=`cat po/Makefile.in.in` || exit

   cat >po/Makefile.in.in <<EOF
 top_builddir=@top_builddir@
 $old_contents
   cat >po/Makefile.in.in <<EOF
 top_builddir=@top_builddir@
 $old_contents


@@ -236,9 +223,9 @@ sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >p
 
 
 # if src/parse-gram.[ch] are out of date, rebuild them.
 
 
 # if src/parse-gram.[ch] are out of date, rebuild them.

-parse_gram_y=$(find src/parse-gram.y \
+parse_gram_y=`find src/parse-gram.y \

                 '(' -newer src/parse-gram.c -o -newer src/parse-gram.h ')' \
                 '(' -newer src/parse-gram.c -o -newer src/parse-gram.h ')' \

-                -print) || exit
+                -print` || exit

 case $parse_gram_y in
 ?*)
   echo "$0: warning: bootstrapping with old src/parse-gram.[ch] files."
 case $parse_gram_y in
 ?*)
   echo "$0: warning: bootstrapping with old src/parse-gram.[ch] files."