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

* bootstrap: Don't assume $(...) works; use ... instead.

Browse Source
This commit is contained in:
Paul Eggert
2004-05-26 06:46:02 +00:00
parent 4bfd5e4e53
commit b9c85d5cef
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2004-05-25 Paul Eggert <eggert@cs.ucla.edu> 2004-05-25 Paul Eggert <eggert@cs.ucla.edu>
* bootstrap: Don't assume $(...) works; use `...` instead.
Problem reported by Paul Hilfinger. Also, diagnose non-GNU
gettext better.
* doc/bison.texinfo (Decl Summary, Bison Options): Clarify what's * doc/bison.texinfo (Decl Summary, Bison Options): Clarify what's
put into the -d output file, and mention what to do if YYSTYPE is put into the -d output file, and mention what to do if YYSTYPE is
defined as a macro. defined as a macro.

27
bootstrap
View File

@@ -46,11 +46,24 @@ done
# Check that gettext version matches what's in configure.ac. # Check that gettext version matches what's in configure.ac.
# FIXME: We shouldn't have to modify configure.ac every time # FIXME: We shouldn't have to modify configure.ac every time
# a new gettext version comes out. # a new gettext version comes out.
gettext_have=$(LC_ALL=C gettext --version | sed 's/.* //; 1q') {
gettext_need=$( gettext_version_output=`LC_ALL=C gettext --version` &&
case $gettext_version_output in
'gettext (GNU '*) ;;
*) false;;
esac
} || {
echo >&2 "$0: Please install GNU gettext first."
exit 1
}
newline='
'
last_word_in_first_line="[^$newline]* \\([^$newline]*\\)"
gettext_have=`expr "$gettext_version_output" : "$last_word_in_first_line"`
gettext_need=`
sed -n '/^AM_GNU_GETTEXT_VERSION/{ s/.*\[//; s/].*//; p; q; }' configure.ac sed -n '/^AM_GNU_GETTEXT_VERSION/{ s/.*\[//; s/].*//; p; q; }' configure.ac
) `
test "$gettext_have" = "$gettext_need" || { [ "$gettext_have" = "$gettext_need" ] || {
echo >&2 "$0: Your gettext version is $gettext_have." echo >&2 "$0: Your gettext version is $gettext_have."
echo >&2 "$0: Please install and use gettext-$gettext_need instead." echo >&2 "$0: Please install and use gettext-$gettext_need instead."
exit 1 exit 1
@@ -223,7 +236,7 @@ mv m4/gettext.m4t m4/gettext.m4 || exit
# 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 || {
echo "$0: prepending 'top_builddir=@top_builddir@' to po/Makefile.in.in ... " echo "$0: prepending 'top_builddir=@top_builddir@' to po/Makefile.in.in ... "
old_contents=$(cat po/Makefile.in.in) || exit old_contents=`cat po/Makefile.in.in` || exit
cat >po/Makefile.in.in <<EOF cat >po/Makefile.in.in <<EOF
top_builddir=@top_builddir@ top_builddir=@top_builddir@
$old_contents $old_contents
@@ -236,9 +249,9 @@ sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >p
# 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 case $parse_gram_y in
?*) ?*)
echo "$0: warning: bootstrapping with old src/parse-gram.[ch] files." echo "$0: warning: bootstrapping with old src/parse-gram.[ch] files."