From e6439708eaeafdc1ca07751868981b9e0d858744 Mon Sep 17 00:00:00 2001 From: John Criswell Date: Mon, 12 Jan 2004 16:14:54 +0000 Subject: [PATCH] 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 --- Makefile.config.in | 3 ++- autoconf/acinclude.m4 | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index d83e93e72a9..34820fdef24 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -58,7 +58,8 @@ AR_PATH = @AR@ # # The pathnames of the Flex and Bison programs, respectively. # -BISON = @YACC@ +YACC = @YACC@ +BISON = @BISON@ FLEX = @LEX@ # diff --git a/autoconf/acinclude.m4 b/autoconf/acinclude.m4 index 0a64803e273..972721ce667 100644 --- a/autoconf/acinclude.m4 +++ b/autoconf/acinclude.m4 @@ -6111,6 +6111,10 @@ fi # Check for Bison. This is modified from # 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_CACHE_CHECK(, ac_cv_has_bison, @@ -6119,7 +6123,7 @@ ac_cv_has_bison, if test "$YACC" != "bison -y"; then AC_MSG_ERROR([bison not found but required]) else - AC_SUBST(YACC,[bison],[location of bison]) + AC_SUBST(BISON,[bison],[location of bison]) fi ])