Require Bison 3.0+ at configure time for SQL features

This commit is contained in:
Evan Miller 2020-08-18 10:02:56 -04:00
parent 2a808d8d05
commit ea368bc0e3

View File

@ -49,7 +49,7 @@ AC_MSG_RESULT( no - SQL engine disable);
sql=false sql=false
fi fi
if $YACC -V >/dev/null 2>&1; then if $YACC -V | grep "bison.* 3[.]" >/dev/null 2>&1; then
if $YACC -Wno-conflicts-sr -V >/dev/null 2>&1; then if $YACC -Wno-conflicts-sr -V >/dev/null 2>&1; then
YFLAGS="$YFLAGS -Wno-conflicts-sr" YFLAGS="$YFLAGS -Wno-conflicts-sr"
fi fi
@ -64,7 +64,7 @@ if test "x$sql" = "xtrue"; then
CFLAGS="$CFLAGS -DSQL" CFLAGS="$CFLAGS -DSQL"
OPTDIRS="$OPTDIRS sql" OPTDIRS="$OPTDIRS sql"
else else
AC_MSG_WARN([Yacc is not available: SQL disabled.]) AC_MSG_WARN([Bison 3.0+ is not available: SQL disabled.])
fi fi
AM_CONDITIONAL(SQL, test x$sql = xtrue) AM_CONDITIONAL(SQL, test x$sql = xtrue)