Catch up to last couple of days' checkins.

[bison.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index e995f486da20076d743a1b20a70d086f00e6afa7..d5ff4966a53522fb04f2f0402b563a72fc094780 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,7 @@
 
 # Bootstrap this package from CVS.
 
 
 # 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
 
 # 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


@@ -16,13 +16,18 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.

 
 # Written by Paul Eggert.
 
 package=bison
 
 
 # Written by Paul Eggert.
 
 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
 # 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
 
 
     cvs -z3 -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib || exit
 

-    trap 0
+    trap - 0

   fi
   GNULIB_SRCDIR=gnulib
 esac
   fi
   GNULIB_SRCDIR=gnulib
 esac


@@ -90,7 +95,9 @@ alloca
 argmatch
 dirname
 error
 argmatch
 dirname
 error

+extensions

 getopt
 getopt

+gettext

 hard-locale
 hash
 malloc
 hard-locale
 hash
 malloc


@@ -99,8 +106,11 @@ obstack
 quote
 quotearg
 stdbool
 quote
 quotearg
 stdbool

+stdio-safer

 stpcpy
 stpcpy

+unistd-safer

 xalloc
 xalloc

+xalloc-die

 xstrndup
 '
 
 xstrndup
 '
 


@@ -129,6 +139,13 @@ for gnulib_file in $gnulib_files; do
 
   case $gnulib_file in
   m4/onceonly_2_57.m4) dest=m4/onceonly.m4;;
 
   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 &&
   esac
 
   rm -f $dest &&


@@ -136,18 +153,35 @@ for gnulib_file in $gnulib_files; do
   cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
 done
 
   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.
 
 case $SKIP_PO in
 '')
 
 # Get translations.
 
 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 \

-     http://www2.iro.umontreal.ca/~gnutra/po/maint/$package/ &&
+     http://www.iro.umontreal.ca/translation/maint/$package/ &&

    ls *.po | sed 's/\.po$//' >LINGUAS
    ls *.po | sed 's/\.po$//' >LINGUAS

-  ) || exit;;
+  ) || exit
+
+  case $package in
+  bison)
+    echo "$0: getting translations into po (please ignore the robots.txt ERROR 404)..."
+    (cd runtime-po &&
+     rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po$/p'` &&
+     wget -nv -nd -r -l 1 -A .po -C off \
+       http://www.iro.umontreal.ca/translation/maint/$package-runtime/ &&
+     ls *.po | sed 's/\.po$//' >LINGUAS
+    ) || exit
+  esac;;

 esac
 
 
 esac
 
 


@@ -176,6 +210,8 @@ intl_files_to_remove='
   aclocal.m4
   intl
   m4/codeset.m4
   aclocal.m4
   intl
   m4/codeset.m4

+  m4/gettext.m4
+  m4/glibc2.m4

   m4/glibc21.m4
   m4/intdiv0.m4
   m4/intmax.m4
   m4/glibc21.m4
   m4/intdiv0.m4
   m4/intmax.m4


@@ -184,8 +220,11 @@ intl_files_to_remove='
   m4/inttypes-pri.m4
   m4/isc-posix.m4
   m4/lcmessage.m4
   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/longdouble.m4
   m4/longlong.m4

+  m4/po.m4

   m4/printf-posix.m4
   m4/signed.m4
   m4/size_max.m4
   m4/printf-posix.m4
   m4/signed.m4
   m4/size_max.m4


@@ -199,33 +238,24 @@ intl_files_to_remove='
 echo $0: rm -fr $intl_files_to_remove ...
 rm -fr $intl_files_to_remove || exit
 
 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 ... "
-  old_contents=$(cat po/Makefile.in.in) || exit
-  cat >po/Makefile.in.in <<EOF
-top_builddir=@top_builddir@
-$old_contents
-EOF
-}
-

 # Put bug-reporting address into po/Makevars.
 echo "$0: sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >po/Makevars ..."
 sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >po/Makevars
 
 # Put bug-reporting address into po/Makevars.
 echo "$0: sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >po/Makevars ..."
 sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >po/Makevars
 

+# Likewise for runtime-po/Makevars, except also change a few other parameters.
+sed '
+  s/^\(DOMAIN\) *=.*/\1 = bison-runtime/
+  s/^\(subdir\) *=.*/\1 = runtime-po/
+  s/^\(XGETTEXT_OPTIONS\) *=.*/\1 = --keyword=YY_/
+' <po/Makevars >runtime-po/Makevars
+
+# Copy identical files from po to runtime-po.
+(cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)

 
 # 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."