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

[bison.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index fe24200ecbca2714adf68006c0e0f99ccad74d88..c9a2303bcda47b57e188ffc717a5f583e044d40c 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -32,9 +32,9 @@ do
     echo "$0: usage: $0 [--gnulib-srcdir=DIR] [--cvs-user=USERNAME] [--skip-po]"
     exit;;
   --gnulib-srcdir=*)
     echo "$0: usage: $0 [--gnulib-srcdir=DIR] [--cvs-user=USERNAME] [--skip-po]"
     exit;;
   --gnulib-srcdir=*)

-    GNULIB_SRCDIR=`expr "$1" : '--gnulib-srcdir=\(.*\)'`;;
+    GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;

   --cvs-user=*)
   --cvs-user=*)

-    CVS_USER=`expr "$1" : '--cvs-user=\(.*\)'`;;
+    CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;;

   --skip-po)
     SKIP_PO=t;;
   *)
   --skip-po)
     SKIP_PO=t;;
   *)


@@ -141,7 +141,7 @@ done
 
 case $SKIP_PO in
 '')
 
 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 \
   (cd po &&
    rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'` &&
    wget -nv -nd -r -l 1 -A .po -C off \


@@ -169,16 +169,48 @@ esac
 echo "$0: autoreconf --verbose --install --force ..."
 autoreconf --verbose --install --force || exit
 
 echo "$0: autoreconf --verbose --install --force ..."
 autoreconf --verbose --install --force || exit
 

+

 # We don't need intl, so remove it.
 # We don't need intl, so remove it.

-echo "$0: rm -fr intl ..."
-rm -fr intl || exit
+# Remove aclocal.m4 too, so that it gets rebuilt.
+intl_files_to_remove='
+  aclocal.m4
+  intl
+  m4/codeset.m4
+  m4/glibc21.m4
+  m4/intdiv0.m4
+  m4/intmax.m4
+  m4/inttypes_h.m4
+  m4/inttypes.m4
+  m4/inttypes-pri.m4
+  m4/isc-posix.m4
+  m4/lcmessage.m4
+  m4/longdouble.m4
+  m4/longlong.m4
+  m4/printf-posix.m4
+  m4/signed.m4
+  m4/size_max.m4
+  m4/stdint_h.m4
+  m4/uintmax_t.m4
+  m4/ulonglong.m4
+  m4/wchar_t.m4
+  m4/wint_t.m4
+  m4/xsize.m4
+'
+echo $0: rm -fr $intl_files_to_remove ...
+rm -fr $intl_files_to_remove || exit

 
 

+echo "$0: patching m4/gettext.m4 so that AM_INTL_SUBDIR is empty ..."
+sed '
+  /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
+    AC_DEFUN([AM_INTL_SUBDIR], [])
+' m4/gettext.m4 >m4/gettext.m4t &&
+mv m4/gettext.m4t m4/gettext.m4 || exit

 
 # Patch what appears to be a bug in gettext 0.14.1;
 # 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 ... "
 
 # Patch what appears to be a bug in gettext 0.14.1;
 # 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


@@ -191,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."