mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-18 08:43:03 +00:00
Undo change made earlier today: it caused autopoint to not bring
in ABOUT-NLS. Ouch. Instead, substitute our own diagnostic for autopoint's.
This commit is contained in:
@@ -1,5 +1,14 @@
|
|||||||
2004-05-24 Paul Eggert <eggert@cs.ucla.edu>
|
2004-05-24 Paul Eggert <eggert@cs.ucla.edu>
|
||||||
|
|
||||||
|
Undo change made earlier today: it caused autopoint to not bring
|
||||||
|
in ABOUT-NLS. Ouch. Instead, substitute our own diagnostic for
|
||||||
|
autopoint's.
|
||||||
|
|
||||||
|
* bootstrap: Check that gettext version matches what's in
|
||||||
|
configure.ac. Warn users to ignore robots.txt ERROR 404.
|
||||||
|
* bootstrap: Undo today's earlier change (logged below).
|
||||||
|
* configure.ac (AM_GNU_GETTEXT_VERSION): Likewise.
|
||||||
|
|
||||||
The gettext version checking is causing more trouble than it's
|
The gettext version checking is causing more trouble than it's
|
||||||
curing; remove it. Problem reported by Paul Hilfinger.
|
curing; remove it. Problem reported by Paul Hilfinger.
|
||||||
|
|
||||||
|
|||||||
16
bootstrap
16
bootstrap
@@ -43,6 +43,19 @@ do
|
|||||||
esac
|
esac
|
||||||
done
|
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_have=$(LC_ALL=C gettext --version | sed 's/.* //; 1q')
|
||||||
|
gettext_need=$(
|
||||||
|
sed -n '/^AM_GNU_GETTEXT_VERSION/{ s/.*\[//; s/].*//; p; q; }' configure.ac
|
||||||
|
)
|
||||||
|
test "$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..."
|
echo "$0: Bootstrapping CVS $package..."
|
||||||
|
|
||||||
build_cvs_prefix() {
|
build_cvs_prefix() {
|
||||||
@@ -141,7 +154,7 @@ done
|
|||||||
|
|
||||||
case $SKIP_PO in
|
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 &&
|
(cd po &&
|
||||||
rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'` &&
|
rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'` &&
|
||||||
wget -nv -nd -r -l 1 -A .po -C off \
|
wget -nv -nd -r -l 1 -A .po -C off \
|
||||||
@@ -166,7 +179,6 @@ esac
|
|||||||
|
|
||||||
# Reconfigure, getting other files.
|
# Reconfigure, getting other files.
|
||||||
|
|
||||||
echo "$0: Expect an 'AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION' warning"
|
|
||||||
echo "$0: autoreconf --verbose --install --force ..."
|
echo "$0: autoreconf --verbose --install --force ..."
|
||||||
autoreconf --verbose --install --force || exit
|
autoreconf --verbose --install --force || exit
|
||||||
|
|
||||||
|
|||||||
@@ -103,6 +103,7 @@ BISON_PREREQ_TIMEVAR
|
|||||||
|
|
||||||
# gnulib and gettext.
|
# gnulib and gettext.
|
||||||
GNULIB_AUTOCONF_SNIPPET
|
GNULIB_AUTOCONF_SNIPPET
|
||||||
|
AM_GNU_GETTEXT_VERSION([0.14.1])
|
||||||
|
|
||||||
# Initialize the test suite.
|
# Initialize the test suite.
|
||||||
AC_CONFIG_TESTDIR(tests)
|
AC_CONFIG_TESTDIR(tests)
|
||||||
|
|||||||
Reference in New Issue
Block a user