Merge pull request elastic#50 from balabit/merge/h/bison-3

Bison 3 fixes
ccin2p3 · Dec 25, 2013 · acbf591 · acbf591
2 parents 920b1ff + 8797068
commit acbf591
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/Makefile.am b/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS			=
 AM_MAKEFLAGS		= --no-print-directory
+AM_YFLAGS		= -Wno-yacc -Wno-other
 
 AM_TESTS_ENVIRONMENT	= top_srcdir="$(top_srcdir)"
 

diff --git a/Mk/lex-rules.am b/Mk/lex-rules.am
@@ -1,5 +1,5 @@
 %.y: %.ym $(syslog_ng_tools)/merge-grammar.pl $(syslog_ng_tools)/cfg-grammar.y
-	$(mkinstalldirs) $(dir $@)
+	$(AM_V_at) $(mkinstalldirs) $(dir $@)
 	$(AM_V_GEN) $(syslog_ng_tools)/merge-grammar.pl $< > $@
 
 .l.c:

diff --git a/configure.ac b/configure.ac
@@ -267,6 +267,9 @@ if echo "$YACC" | grep bison > /dev/null; then
 	if test "$bison_version_major" -lt 2 -o "$bison_version_minor" -lt 4; then
 		yacc_ok=0
 	fi
+	if test "$bison_version_major" -gt 2; then
+		yacc_ok=1
+	fi
 else
 	yacc_ok=0
 fi

diff --git a/lib/cfg-grammar.y b/lib/cfg-grammar.y
@@ -78,6 +78,10 @@ extern struct _StatsOptions *last_stats_options;
 
 %code {
 
+# ifndef YYID
+# define YYID(N) N
+# endif
+
 # define YYLLOC_DEFAULT(Current, Rhs, N)                                \
   do {                                                                  \
     if (YYID (N))                                                       \