The configure script now defines BISON as the name of the bison program and

YACC as bison -y.  In this way, we ensure that bison is being used, but
the Makefiles have macros for using bison itself and for getting bison to
act like it is traditional yacc.

llvm-svn: 10774
This commit is contained in:
John Criswell 2004-01-12 16:14:54 +00:00
parent 975c8bde79
commit cd08e2815f
2 changed files with 7 additions and 2 deletions

View File

@ -58,7 +58,8 @@ AR_PATH = @AR@
# #
# The pathnames of the Flex and Bison programs, respectively. # The pathnames of the Flex and Bison programs, respectively.
# #
BISON = @YACC@ YACC = @YACC@
BISON = @BISON@
FLEX = @LEX@ FLEX = @LEX@
# #

View File

@ -6111,6 +6111,10 @@ fi
# Check for Bison. This is modified from # Check for Bison. This is modified from
# http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_namespaces.html # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_namespaces.html
# #
# This macro verifies that Bison is installed. If successful, then
# 1) YACC is set to bison -y (to emulate YACC calls)
# 2) BISON is set to bison
#
AC_DEFUN([AC_PROG_BISON], AC_DEFUN([AC_PROG_BISON],
[AC_CACHE_CHECK(, [AC_CACHE_CHECK(,
ac_cv_has_bison, ac_cv_has_bison,
@ -6119,7 +6123,7 @@ ac_cv_has_bison,
if test "$YACC" != "bison -y"; then if test "$YACC" != "bison -y"; then
AC_MSG_ERROR([bison not found but required]) AC_MSG_ERROR([bison not found but required])
else else
AC_SUBST(YACC,[bison],[location of bison]) AC_SUBST(BISON,[bison],[location of bison])
fi fi
]) ])