diff options
| author | John Criswell <criswell@uiuc.edu> | 2004-01-12 16:14:54 +0000 |
|---|---|---|
| committer | John Criswell <criswell@uiuc.edu> | 2004-01-12 16:14:54 +0000 |
| commit | b8b80c455ff0a7f6147e0fc11f6e2ea3c4a2dfef (patch) | |
| tree | 4382cc06b8156944ff56c7c2361e1abfbb7a1a79 | |
| parent | f998a7e671e69269697fd8f8803637e843f983d1 (diff) | |
| download | llvm-b8b80c455ff0a7f6147e0fc11f6e2ea3c4a2dfef.tar.gz llvm-b8b80c455ff0a7f6147e0fc11f6e2ea3c4a2dfef.tar.bz2 llvm-b8b80c455ff0a7f6147e0fc11f6e2ea3c4a2dfef.tar.xz | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10774 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile.config.in | 3 | ||||
| -rw-r--r-- | autoconf/acinclude.m4 | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.config.in b/Makefile.config.in index d83e93e72a..34820fdef2 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 0a64803e27..972721ce66 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 ]) |