Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bison: A bit more verbose error messages in config.

Browse source
This commit is contained in:
Jan Maria Matejka 2018-08-14 14:36:44 +02:00
parent 78ca6ea8f0
commit 7ffc0a6534
4 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.in
View file

@ -10,6 +10,7 @@ CPPFLAGS=-I$(objdir) -I$(srcdir) @CPPFLAGS@
CFLAGS=$(CPPFLAGS) @CFLAGS@ CFLAGS=$(CPPFLAGS) @CFLAGS@
LDFLAGS=@LDFLAGS@ LDFLAGS=@LDFLAGS@
M4FLAGS=@M4FLAGS@ M4FLAGS=@M4FLAGS@
BISONFLAGS=@BISONFLAGS@
LIBS=@LIBS@ LIBS=@LIBS@
DAEMON_LIBS=@DAEMON_LIBS@ DAEMON_LIBS=@DAEMON_LIBS@
CLIENT_LIBS=@CLIENT_LIBS@ CLIENT_LIBS=@CLIENT_LIBS@

2
aclocal.m4 vendored
View file

@ -185,9 +185,11 @@ AC_DEFUN([BIRD_CHECK_BISON_VERSION],
;; ;;
2.*) 2.*)
bird_bison_synclines=no bird_bison_synclines=no
bird_bison_enhanced_error=no
;; ;;
3.* | 4.* | 5.* | 6.* | 7.* | 8.* | 9.*) 3.* | 4.* | 5.* | 6.* | 7.* | 8.* | 9.*)
bird_bison_synclines=yes bird_bison_synclines=yes
bird_bison_enhanced_error=yes
;; ;;
*) *)
AC_MSG_ERROR([Couldn't parse Bison version $$1. Call the developers for help.]) AC_MSG_ERROR([Couldn't parse Bison version $$1. Call the developers for help.])

2
conf/Makefile
View file

@ -20,7 +20,7 @@ $(o)commands.h: | $(s)gen_commands.m4 $(srcdir)/client/cmds.m4
$(o)cf-parse.tab.h: $(o)cf-parse.tab.c $(o)cf-parse.tab.h: $(o)cf-parse.tab.c
$(o)cf-parse.tab.c: $(o)cf-parse.y $(o)cf-parse.tab.c: $(o)cf-parse.y
$(BISON) $(BISON_DEBUG) -dv -pcf_ -b $(@:.tab.c=) $< $(BISON) $(BISON_DEBUG) $(BISONFLAGS) -dv -pcf_ -b $(@:.tab.c=) $<
$(o)cf-lex.c: $(s)cf-lex.l $(o)cf-lex.c: $(s)cf-lex.l
$(FLEX) $(FLEX_DEBUG) -s -B -8 -Pcf_ -o$@ $< $(FLEX) $(FLEX_DEBUG) -s -B -8 -Pcf_ -o$@ $<

5
configure.ac
View file

@ -164,7 +164,12 @@ if test "$bird_bison_synclines" = yes; then
M4FLAGS="$M4FLAGS -s" M4FLAGS="$M4FLAGS -s"
fi fi
if test "$bird_bison_enhanced_error" = yes; then
BISONFLAGS="$BISONFLAGS -Dparse.lac=full -Dparse.error=verbose"
fi
AC_SUBST([M4FLAGS]) AC_SUBST([M4FLAGS])
AC_SUBST([BISONFLAGS])
BIRD_CHECK_PROG_FLAVOR_GNU([$M4], BIRD_CHECK_PROG_FLAVOR_GNU([$M4],
[], [],