Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-19 09:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust to latest gnulib.

Browse Source 
(gnulib_modules): Add xalloc-die.
Set LC_ALL=C so that file names sort consistently.
Prefer the gnulib copies of gettext.m4, glibc21.m4,
inttypes_h.m4, lib-ld.m4, lib-prefix.m4, po.m4, stdint_h.m4,
uintmax_t.m4, ulonglong.m4.
(intl_files_to_remove): Add gettext.m4, lib-ld.m4, lib-prefix.m4,
po.m4 since we are now using _gl.m4 instead.
This commit is contained in:
Paul Eggert
2004-08-13 14:28:43 +00:00
parent 87a8ad5cd3
commit a9f027b9c4
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
bootstrap
View File

@@ -23,6 +23,11 @@
package=bison 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. # Parse options.
for option for option
@@ -101,6 +106,7 @@ quotearg
stdbool stdbool
stpcpy stpcpy
xalloc xalloc
xalloc-die
xstrndup xstrndup
' '
@@ -129,6 +135,13 @@ for gnulib_file in $gnulib_files; do
case $gnulib_file in case $gnulib_file in
m4/onceonly_2_57.m4) dest=m4/onceonly.m4;; 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 esac
rm -f $dest && rm -f $dest &&
@@ -136,6 +149,12 @@ for gnulib_file in $gnulib_files; do
cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
done 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. # Get translations.
@@ -176,6 +195,7 @@ intl_files_to_remove='
aclocal.m4 aclocal.m4
intl intl
m4/codeset.m4 m4/codeset.m4
m4/gettext.m4
m4/glibc21.m4 m4/glibc21.m4
m4/intdiv0.m4 m4/intdiv0.m4
m4/intmax.m4 m4/intmax.m4
@@ -184,8 +204,11 @@ intl_files_to_remove='
m4/inttypes-pri.m4 m4/inttypes-pri.m4
m4/isc-posix.m4 m4/isc-posix.m4
m4/lcmessage.m4 m4/lcmessage.m4
m4/lib-ld.m4
m4/lib-prefix.m4
m4/longdouble.m4 m4/longdouble.m4
m4/longlong.m4 m4/longlong.m4
m4/po.m4
m4/printf-posix.m4 m4/printf-posix.m4
m4/signed.m4 m4/signed.m4
m4/size_max.m4 m4/size_max.m4
@@ -199,13 +222,6 @@ intl_files_to_remove='
echo $0: rm -fr $intl_files_to_remove ... echo $0: rm -fr $intl_files_to_remove ...
rm -fr $intl_files_to_remove || exit 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; # Patch what appears to be a bug in gettext 0.14.1;
# remove this once the bug is fixed. # remove this once the bug is fixed.
grep @top_builddir@ po/Makefile.in.in >/dev/null || { grep @top_builddir@ po/Makefile.in.in >/dev/null || {