* configure: When handling a Canadian Cross, handle YACC as well as
BISON. Just set BISON to bison. When setting YACC, prefer bison.
This commit is contained in:
parent
23cb1bc1aa
commit
72d8a21508
12
ChangeLog
12
ChangeLog
|
@ -1,3 +1,15 @@
|
||||||
|
Thu Aug 14 14:42:17 1997 Ian Lance Taylor <ian@cygnus.com>
|
||||||
|
|
||||||
|
* configure: When handling a Canadian Cross, handle YACC as well as
|
||||||
|
BISON. Just set BISON to bison. When setting YACC, prefer bison.
|
||||||
|
|
||||||
|
Tue Aug 12 20:09:48 1997 Jason Merrill <jason@yorick.cygnus.com>
|
||||||
|
|
||||||
|
* Makefile.in (BISON): bison, not byacc or bison -y.
|
||||||
|
(YACC): bison -y or byacc or yacc.
|
||||||
|
(various): Add *-bison as appropriate.
|
||||||
|
(taz): No need to mess with BISON anymore.
|
||||||
|
|
||||||
Tue Aug 12 22:33:08 1997 Ian Lance Taylor <ian@cygnus.com>
|
Tue Aug 12 22:33:08 1997 Ian Lance Taylor <ian@cygnus.com>
|
||||||
|
|
||||||
* configure: If OSTYPE matches *win32*, try to find a good value for
|
* configure: If OSTYPE matches *win32*, try to find a good value for
|
||||||
|
|
|
@ -96,6 +96,7 @@ case "${OSTYPE}" in
|
||||||
if [ ! -f /bin/sh ]; then
|
if [ ! -f /bin/sh ]; then
|
||||||
if [ x${SHELL} != x ] && [ -f ${SHELL} ]; then
|
if [ x${SHELL} != x ] && [ -f ${SHELL} ]; then
|
||||||
CONFIG_SHELL=${SHELL}
|
CONFIG_SHELL=${SHELL}
|
||||||
|
export CONFIG_SHELL
|
||||||
else
|
else
|
||||||
for prog in sh sh.exe bash bash.exe; do
|
for prog in sh sh.exe bash bash.exe; do
|
||||||
IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
|
IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
|
||||||
|
@ -103,6 +104,7 @@ case "${OSTYPE}" in
|
||||||
test -z "$dir" && dir=.
|
test -z "$dir" && dir=.
|
||||||
if test -f $dir/$prog; then
|
if test -f $dir/$prog; then
|
||||||
CONFIG_SHELL=$dir/$prog
|
CONFIG_SHELL=$dir/$prog
|
||||||
|
export CONFIG_SHELL
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -767,7 +769,7 @@ if [ "${build}" != "${host}" ]; then
|
||||||
tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET GCC_FOR_TARGET HOST_PREFIX"
|
tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET GCC_FOR_TARGET HOST_PREFIX"
|
||||||
tools="${tools} HOST_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM"
|
tools="${tools} HOST_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM"
|
||||||
tools="${tools} NM_FOR_TARGET RANLIB RANLIB_FOR_TARGET"
|
tools="${tools} NM_FOR_TARGET RANLIB RANLIB_FOR_TARGET"
|
||||||
tools="${tools} WINDRES WINDRES_FOR_TARGET"
|
tools="${tools} WINDRES WINDRES_FOR_TARGET YACC"
|
||||||
|
|
||||||
for var in ${tools}; do
|
for var in ${tools}; do
|
||||||
if [ -z "`eval 'echo $'"${var}"`" -a -r Makefile ]; then
|
if [ -z "`eval 'echo $'"${var}"`" -a -r Makefile ]; then
|
||||||
|
@ -789,6 +791,7 @@ t loop
|
||||||
AR_FOR_TARGET=${AR_FOR_TARGET-${target_alias}-ar}
|
AR_FOR_TARGET=${AR_FOR_TARGET-${target_alias}-ar}
|
||||||
AS=${AS-${host_alias}-as}
|
AS=${AS-${host_alias}-as}
|
||||||
AS_FOR_TARGET=${AS_FOR_TARGET-${target_alias}-as}
|
AS_FOR_TARGET=${AS_FOR_TARGET-${target_alias}-as}
|
||||||
|
BISON=${BISON-bison}
|
||||||
CC=${CC-${host_alias}-gcc}
|
CC=${CC-${host_alias}-gcc}
|
||||||
CFLAGS=${CFLAGS-"-g -O2"}
|
CFLAGS=${CFLAGS-"-g -O2"}
|
||||||
CXX=${CXX-${host_alias}-c++}
|
CXX=${CXX-${host_alias}-c++}
|
||||||
|
@ -811,26 +814,26 @@ t loop
|
||||||
WINDRES=${WINDRES-${host_alias}-windres}
|
WINDRES=${WINDRES-${host_alias}-windres}
|
||||||
WINDRES_FOR_TARGET=${WINDRES_FOR_TARGET-${target_alias}-windres}
|
WINDRES_FOR_TARGET=${WINDRES_FOR_TARGET-${target_alias}-windres}
|
||||||
|
|
||||||
if [ -z "${BISON}" ]; then
|
if [ -z "${YACC}" ]; then
|
||||||
IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
|
IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
|
||||||
for dir in $PATH; do
|
for dir in $PATH; do
|
||||||
test -z "$dir" && dir=.
|
test -z "$dir" && dir=.
|
||||||
if test -f $dir/byacc; then
|
if test -f $dir/bison; then
|
||||||
BISON=byacc
|
YACC="bison -y"
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
if test -f $dir/bison; then
|
if test -f $dir/byacc; then
|
||||||
BISON="bison -y"
|
YACC=byacc
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
if test -f $dir/yacc; then
|
if test -f $dir/yacc; then
|
||||||
BISON=yacc
|
YACC=yacc
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
IFS="$save_ifs"
|
IFS="$save_ifs"
|
||||||
if [ -z "${BISON}" ]; then
|
if [ -z "${YACC}" ]; then
|
||||||
BISON="bison -y"
|
YACC="bison -y"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue