From 7e0049e99d9f52659813c31e3f5abc432ec6a137 Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Mon, 6 Oct 2014 20:18:57 -0600 Subject: [PATCH] Fix bison parsing Changes from me to switch the order in which we choose to use yacc or bison, default to using bison if we have it. Signed-off-by: Jens Axboe --- Makefile | 2 +- configure | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 424a112f..56620152 100644 --- a/Makefile +++ b/Makefile @@ -277,7 +277,7 @@ y.tab.o: y.tab.c y.tab.h $(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $< y.tab.c: exp/expression-parser.y - $(QUIET_YACC)$(YACC) --no-lines -d exp/expression-parser.y + $(QUIET_YACC)$(YACC) --no-lines -d -b y exp/expression-parser.y y.tab.h: y.tab.c diff --git a/configure b/configure index f7d8ff92..e3ec2523 100755 --- a/configure +++ b/configure @@ -1279,14 +1279,14 @@ LEX=$(which lex 2> /dev/null) if test -x "$LEX" ; then lex="yes" fi -YACC=$(which yacc 2> /dev/null) +YACC=$(which bison 2> /dev/null) if test -x "$YACC" ; then yacc="yes" + yacc_is_bison="yes" else - YACC=$(which bison 2> /dev/null) + YACC=$(which yacc 2> /dev/null) if test -x "$YACC" ; then yacc="yes" - yacc_is_bison="yes" fi fi if test "$yacc" = "yes" && test "$lex" = "yes" ; then -- 2.25.1