Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

build: support bison < 3.0 for parse.error=verbose

Browse source 
*sigh*

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-01-23 23:26:23 +01:00
parent af2567b646
commit 05dbb7df2f
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -1459,6 +1459,7 @@ case "x${quagga_ac_bison_version}" in
x2.7*) x2.7*)
BISON_OPENBRACE='"' BISON_OPENBRACE='"'
BISON_CLOSEBRACE='"' BISON_CLOSEBRACE='"'
BISON_VERBOSE=''
AC_MSG_RESULT([$quagga_ac_bison_version - 2.7 or older]) AC_MSG_RESULT([$quagga_ac_bison_version - 2.7 or older])
;; ;;
x2.*|x1.*) x2.*|x1.*)
@ -1474,11 +1475,13 @@ case "x${quagga_ac_bison_version}" in
*) *)
BISON_OPENBRACE='{' BISON_OPENBRACE='{'
BISON_CLOSEBRACE='}' BISON_CLOSEBRACE='}'
BISON_VERBOSE='-Dparse.error=verbose'
AC_MSG_RESULT([$quagga_ac_bison_version - 3.0 or newer]) AC_MSG_RESULT([$quagga_ac_bison_version - 3.0 or newer])
;; ;;
esac esac
AC_SUBST(BISON_OPENBRACE) AC_SUBST(BISON_OPENBRACE)
AC_SUBST(BISON_CLOSEBRACE) AC_SUBST(BISON_CLOSEBRACE)
AC_SUBST(BISON_VERBOSE)
if $quagga_ac_bison_missing; then if $quagga_ac_bison_missing; then
YACC="$SHELL $missing_dir/missing bison -y" YACC="$SHELL $missing_dir/missing bison -y"

2
lib/Makefile.am
View file

@ -3,7 +3,7 @@
AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
AM_CFLAGS = $(WERROR) AM_CFLAGS = $(WERROR)
DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
AM_YFLAGS = -d -Dapi.prefix=@BISON_OPENBRACE@cmd_yy@BISON_CLOSEBRACE@ AM_YFLAGS = -d -Dapi.prefix=@BISON_OPENBRACE@cmd_yy@BISON_CLOSEBRACE@ @BISON_VERBOSE@
command_lex.h: command_lex.c command_lex.h: command_lex.c
@if test ! -f $@; then rm -f command_lex.c; else :; fi @if test ! -f $@; then rm -f command_lex.c; else :; fi

2
lib/command_parse.y
View file

@ -28,7 +28,7 @@
%} %}
%locations %locations
%define parse.error verbose /* define parse.error verbose */
%define api.pure full %define api.pure full
/* define api.prefix {cmd_yy} */ /* define api.prefix {cmd_yy} */