Description: Debian-specific changes mixed together.
 This patch contains all the Debian-specific changes mixed together. To
 review them separately, please inspect the Git history (see the
 Vcs-Git field in debian/control); the patches against upstream are all
 on the patched branch.
 .
 For more information, please see debian/README.source.
Origin: Debian

--- syslog-ng-3.5.3.orig/configure.ac
+++ syslog-ng-3.5.3/configure.ac
@@ -271,6 +271,9 @@ if echo "$YACC" | grep bison > /dev/null
 	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
--- syslog-ng-3.5.3.orig/Makefile.am
+++ syslog-ng-3.5.3/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)"
 
--- syslog-ng-3.5.3.orig/Mk/lex-rules.am
+++ syslog-ng-3.5.3/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:
--- syslog-ng-3.5.3.orig/lib/cfg-grammar.y
+++ syslog-ng-3.5.3/lib/cfg-grammar.y
@@ -74,6 +74,10 @@ extern struct _ValuePairsTransformSet *l
 
 %code {
 
+# ifndef YYID
+# define YYID(N) N
+# endif
+
 # define YYLLOC_DEFAULT(Current, Rhs, N)                                \
   do {                                                                  \
     if (YYID (N))                                                       \
