* data/lalr1.cc: Adjust the indentation of the labels.

[bison.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index dcea122b827d8efe1b17e345c96e8f27a1587f67..b30d8f506e7ca28db0c7d0cdf25d0b8376389f3f 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -23,6 +23,11 @@
 
 package=bison
 
+# Ensure file names are sorted consistently across platforms;
+# e.g., m4/ulonglong_gl.m4 should follow m4/ulonglong.m4.
+LC_ALL=C
+export LC_ALL
+
 # Parse options.
 
 for option
@@ -43,32 +48,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() {
@@ -127,6 +106,7 @@ quotearg
 stdbool
 stpcpy
 xalloc
+xalloc-die
 xstrndup
 '
 
@@ -155,6 +135,13 @@ for gnulib_file in $gnulib_files; do
 
   case $gnulib_file in
   m4/onceonly_2_57.m4) dest=m4/onceonly.m4;;
+  # These will be overwritten by autopoint, which still uses
+  # old jm_.* macro names, so we have to keep both copies.
+  # m4/gettext.m4 isn't mentioned here, since it's patched below.
+  m4/glibc21.m4 | m4/inttypes_h.m4 | m4/lib-ld.m4 | \
+  m4/lib-prefix.m4 | m4/po.m4 | m4/stdint_h.m4 | m4/uintmax_t.m4 | \
+  m4/ulonglong.m4)
+    dest=`expr $gnulib_file : '\(.*\).m4'`_gl.m4;;
   esac
 
   rm -f $dest &&
@@ -162,6 +149,12 @@ for gnulib_file in $gnulib_files; do
   cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
 done
 
+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_gl.m4 || exit
+
 
 # Get translations.
 
@@ -202,6 +195,7 @@ intl_files_to_remove='
   aclocal.m4
   intl
   m4/codeset.m4
+  m4/gettext.m4
   m4/glibc21.m4
   m4/intdiv0.m4
   m4/intmax.m4
@@ -210,8 +204,11 @@ intl_files_to_remove='
   m4/inttypes-pri.m4
   m4/isc-posix.m4
   m4/lcmessage.m4
+  m4/lib-ld.m4
+  m4/lib-prefix.m4
   m4/longdouble.m4
   m4/longlong.m4
+  m4/po.m4
   m4/printf-posix.m4
   m4/signed.m4
   m4/size_max.m4
@@ -225,13 +222,6 @@ intl_files_to_remove='
 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 || {