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

diff --git a/Makefile.config.in b/Makefile.config.in
index d83e93e72a9664c67fdcfc720b1b91f9994fba64..34820fdef243b39374f8798b25435387abb98e71 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -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@
 
 #

diff --git a/autoconf/acinclude.m4 b/autoconf/acinclude.m4
index 0a64803e27302d5dba3097fcb87a9a88b1a909c9..972721ce6679914889a833c2a8fb662502fa05dc 100644 (file)
--- 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
 #
 # 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,
 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
 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
 ])
 
 fi
 ])