X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/caa52c10c577ddf4507d6db6f92085806bc848fb..727e8b0bde9320b59e2e44e437ec6bf908f05572:/bootstrap

diff --git a/bootstrap b/bootstrap
index c9a2303b..59766a55 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,7 @@
 
 # Bootstrap this package from CVS.
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -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
@@ -78,7 +83,7 @@ case ${GNULIB_SRCDIR--} in
 
     cvs -z3 -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib || exit
 
-    trap 0
+    trap - 0
   fi
   GNULIB_SRCDIR=gnulib
 esac
@@ -90,6 +95,7 @@ alloca
 argmatch
 dirname
 error
+extensions
 getopt
 hard-locale
 hash
@@ -101,6 +107,7 @@ quotearg
 stdbool
 stpcpy
 xalloc
+xalloc-die
 xstrndup
 '
 
@@ -129,6 +136,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 &&
@@ -136,6 +150,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.
 
@@ -176,6 +196,7 @@ intl_files_to_remove='
   aclocal.m4
   intl
   m4/codeset.m4
+  m4/gettext.m4
   m4/glibc21.m4
   m4/intdiv0.m4
   m4/intmax.m4
@@ -184,8 +205,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
@@ -199,13 +223,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 || {