diff --git a/CMakeLists.txt b/CMakeLists.txt index 36a7462b38..60a89d6357 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -175,7 +175,7 @@ set(WITH_GETTEXT "" CACHE STRING "Set the prefix where gettext is installed (e.g set(CMAKE_C_STANDARD 99) -find_package(BISON 3.4.2 REQUIRED) +find_package(BISON 3.7.6 REQUIRED) string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\..*$" _dummy "${BISON_VERSION}") diff --git a/configure.ac b/configure.ac index 12cc3ca9a6..afca88c182 100644 --- a/configure.ac +++ b/configure.ac @@ -434,11 +434,11 @@ if echo "$YACC" | grep -q bison; then bison_version_minor=`echo $bison_version | cut -d. -f2` bison_version_patch=`echo $bison_version | cut -d. -f3` if ([[ "$bison_version_major" -gt 3 ]]) || - ([[ "$bison_version_major" -eq 3 ]] && [[ "$bison_version_minor" -gt 4 ]]) || - ([[ "$bison_version_major" -eq 3 ]] && [[ "$bison_version_minor" -eq 4 ]] && [[ "$bison_version_patch" -ge 2 ]]); then + ([[ "$bison_version_major" -eq 3 ]] && [[ "$bison_version_minor" -gt 7 ]]) || + ([[ "$bison_version_major" -eq 3 ]] && [[ "$bison_version_minor" -eq 7 ]] && [[ "$bison_version_patch" -ge 6 ]]); then yacc_ok=1 else - AC_MSG_WARN([bison is found, but your bison version $bison_version is not recent enough, at least 3.4.2 is required]) + AC_MSG_WARN([bison is found, but your bison version $bison_version is not recent enough, at least 3.7.6 is required]) fi fi @@ -447,7 +447,7 @@ if test $yacc_ok = 0; then AC_MSG_WARN([No proper bison found, you'll not be able to change lib/cfg-grammar.y]) YACC="echo Required bison not found && false" else - AC_MSG_ERROR([syslog-ng requires bison 3.4.2 or later. Your source tree seems to be from git, which doesn't have the bison generated files (like cfg-grammar.c). Please install/upgrade bison or use a distribution tarball.]) + AC_MSG_ERROR([syslog-ng requires bison 3.7.6 or later. Your source tree seems to be from git, which doesn't have the bison generated files (like cfg-grammar.c). Please install/upgrade bison or use a distribution tarball.]) fi fi diff --git a/lib/cfg-grammar.y b/lib/cfg-grammar.y index f5a93ed8ff..c5d8f6ae23 100644 --- a/lib/cfg-grammar.y +++ b/lib/cfg-grammar.y @@ -52,7 +52,7 @@ /* START_DECLS */ -%require "3.4.2" +%require "3.7.6" %locations %define api.pure %define api.value.type {CFG_STYPE}