aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rwxr-xr-xconfigure21
2 files changed, 24 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index cfe5762..81b567f 100644
--- a/ChangeLog
+++ b/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>
* configure: If OSTYPE matches *win32*, try to find a good value for
diff --git a/configure b/configure
index 20c0048..0185f0e 100755
--- a/configure
+++ b/configure
@@ -96,6 +96,7 @@ case "${OSTYPE}" in
if [ ! -f /bin/sh ]; then
if [ x${SHELL} != x ] && [ -f ${SHELL} ]; then
CONFIG_SHELL=${SHELL}
+ export CONFIG_SHELL
else
for prog in sh sh.exe bash bash.exe; do
IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
@@ -103,6 +104,7 @@ case "${OSTYPE}" in
test -z "$dir" && dir=.
if test -f $dir/$prog; then
CONFIG_SHELL=$dir/$prog
+ export CONFIG_SHELL
break
fi
done
@@ -767,7 +769,7 @@ if [ "${build}" != "${host}" ]; then
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} 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
if [ -z "`eval 'echo $'"${var}"`" -a -r Makefile ]; then
@@ -789,6 +791,7 @@ t loop
AR_FOR_TARGET=${AR_FOR_TARGET-${target_alias}-ar}
AS=${AS-${host_alias}-as}
AS_FOR_TARGET=${AS_FOR_TARGET-${target_alias}-as}
+ BISON=${BISON-bison}
CC=${CC-${host_alias}-gcc}
CFLAGS=${CFLAGS-"-g -O2"}
CXX=${CXX-${host_alias}-c++}
@@ -811,26 +814,26 @@ t loop
WINDRES=${WINDRES-${host_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}:"
for dir in $PATH; do
test -z "$dir" && dir=.
- if test -f $dir/byacc; then
- BISON=byacc
+ if test -f $dir/bison; then
+ YACC="bison -y"
break
fi
- if test -f $dir/bison; then
- BISON="bison -y"
+ if test -f $dir/byacc; then
+ YACC=byacc
break
fi
if test -f $dir/yacc; then
- BISON=yacc
+ YACC=yacc
break
fi
done
IFS="$save_ifs"
- if [ -z "${BISON}" ]; then
- BISON="bison -y"
+ if [ -z "${YACC}" ]; then
+ YACC="bison -y"
fi
fi