# Translation Project URL, for the registry of all projects.
TP_URL='http://www.iro.umontreal.ca/translation/registry.cgi?domain='
-# Ensure file names are sorted consistently across platforms;
-# e.g., m4/ulonglong_gl.m4 should follow m4/ulonglong.m4.
+# Ensure file names are sorted consistently across platforms.
# Also, ensure diagnostics are in English, e.g., "wget --help" below.
LC_ALL=C
export LC_ALL
GNULIB_SRCDIR=gnulib
esac
-<$GNULIB_SRCDIR/gnulib-tool || exit
+gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
+<$gnulib_tool || exit
gnulib_modules='
argmatch
dirname
error
extensions
+fopen-safer
getopt
gettext
-hard-locale
hash
malloc
mbswidth
quote
quotearg
stdbool
-stdio-safer
stdint
stpcpy
strerror
gnulib_modules=`
(echo "$gnulib_modules"
for gnulib_module in $gnulib_modules; do
- $GNULIB_SRCDIR/gnulib-tool --extract-dependencies $gnulib_module
+ $gnulib_tool --extract-dependencies $gnulib_module
done) | sort -u
`
done
gnulib_files=`
- (for gnulib_module in $gnulib_modules; do
- $GNULIB_SRCDIR/gnulib-tool --extract-filelist $gnulib_module
+ (echo m4/warning.m4
+ for gnulib_module in $gnulib_modules; do
+ $gnulib_tool --extract-filelist $gnulib_module
done) | sort -u
`
for gnulib_file in $gnulib_files; do
dest=$gnulib_file
-
- case $gnulib_file in
- # 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 &&
echo "$0: Copying file $GNULIB_SRCDIR/$gnulib_file" &&
cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
# This suppresses a bogus diagnostic
# "warning: macro `AM_LANGINFO_CODESET' not found in library".
-echo "$0: patching m4/gettext.m4 so that AM_INTL_SUBDIR is empty ..."
+echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
sed '
/^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
AC_DEFUN([AM_INTL_SUBDIR], [])
+ /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
+ AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
' m4/gettext.m4 >m4/gettext_gl.m4 || exit
' | awk -v domain="$domain" -v subdir="$subdir" '
{
lang = $1
+
+ # Work around bugs in Bison 2.3 translations uncovered by gettext 0.15.
+ # This workaround can be removed once the translations are fixed.
+ if (lang == "id" || lang == "tr") next
+
ver = $2
urlfmt = ""
printf "$WGET_COMMAND -O %s/%s.po 'http://www.iro.umontreal.ca/translation/teams/PO/%s/%s-%s.%s.po' &&\n", subdir, lang, lang, domain, ver, lang
(echo '# This file is generated automatically by "bootstrap".' &&
echo 'AC_DEFUN([GNULIB_AUTOCONF_SNIPPET],[' &&
- $GNULIB_SRCDIR/gnulib-tool --extract-autoconf-snippet $gnulib_modules &&
+ $gnulib_tool --extract-autoconf-snippet $gnulib_modules |
+ sed 's/AM_GNU_GETTEXT(\[external]/&, [need-ngettext]/' &&
echo '])'
) >m4/gnulib.m4 || exit
(echo '# This file is generated automatically by "bootstrap".' &&
- $GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_modules |
+ $gnulib_tool --extract-automake-snippet $gnulib_modules |
sed 's/^[ ]*AM_CPPFLAGS[ ]*+=/# (commented out by bootstrap) &/'
) >lib/gnulib.mk || exit
# Reconfigure, getting other files.
-echo "$0: autoreconf --verbose --install --force ..."
-autoreconf --verbose --install --force || exit
-
+echo "$0: autopoint --force ..."
+autopoint --force || exit
# We don't need intl, so remove it.
-# Remove aclocal.m4 too, so that it gets rebuilt.
intl_files_to_remove='
- aclocal.m4
intl
m4/codeset.m4
m4/gettext.m4
m4/glibc21.m4
m4/intdiv0.m4
m4/intmax.m4
- m4/inttypes_h.m4
- m4/inttypes.m4
+ m4/inttypes-h.m4
m4/inttypes-pri.m4
- m4/isc-posix.m4
m4/lcmessage.m4
- m4/lib-ld.m4
- m4/lib-prefix.m4
+ m4/lock.m4
m4/longdouble.m4
- m4/po.m4
m4/printf-posix.m4
m4/signed.m4
m4/size_max.m4
- m4/stdint_h.m4
- m4/uintmax_t.m4
- m4/ulonglong.m4
+ m4/visibility.m4
m4/wint_t.m4
m4/xsize.m4
'
echo $0: rm -fr $intl_files_to_remove ...
rm -fr $intl_files_to_remove || exit
+
# Undo changes to gnulib files that autoreconf made.
for gnulib_file in $gnulib_files; do
test ! -f $gnulib_file || cmp -s $gnulib_file $GNULIB_SRCDIR/$gnulib_file || {
}
done
+# Make sure aclocal.m4 is not older than input files.
+sleep 1
+
+for command in \
+ 'aclocal --force -I m4' \
+ 'autoconf --force' \
+ 'autoheader --force' \
+ 'automake --add-missing --copy --force-missing';
+do
+ echo "$0: $command ..."
+ $command || exit
+done
+
+
# 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
+echo "$0: Creating po/Makevars from po/Makevars.template ..."
+sed '
+ /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/
+ /^XGETTEXT_OPTIONS *=/{
+ s/$/ \\/
+ a\
+ --flag=_:1:pass-c-format \\\
+ --flag=N_:1:pass-c-format \\\
+ --flag=error:3:c-format --flag=error_at_line:5:c-format \\\
+ --flag=warn:1:c-format --flag=warn_at:2:c-format \\\
+ --flag=complain:1:c-format --flag=complain_at:2:c-format \\\
+ --flag=fatal:1:c-format --flag=fatal_at:2:c-format
+ }
+' po/Makevars.template >po/Makevars
# Likewise for runtime-po/Makevars, except also change a few other parameters.
sed '
s/^\(XGETTEXT_OPTIONS\) *=.*/\1 = --keyword=YY_/
' <po/Makevars >runtime-po/Makevars
-# Append 'datarootdir = $(prefix)/share' to po/Makefile.in.in to work
-# around an incompatibility between Autoconf 2.60 and gettext 0.14.6.
-# This hack can be removed once we assume gettext 0.15 or later.
-grep datarootdir po/Makefile.in.in >/dev/null ||
- echo 'datarootdir = @datarootdir@' >>po/Makefile.in.in
-
# Copy identical files from po to runtime-po.
(cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
projects / bison.git / blobdiff