Merge branch 'dev' of github.com:mdbtools/mdbtools into dev

This commit is contained in:
Evan Miller
2020-12-23 15:37:18 -05:00
4 changed files with 32 additions and 35 deletions

View File

@@ -37,7 +37,7 @@ AC_CHECK_DECLS([program_invocation_short_name], [], [], [[
dnl Checks for library functions.
VL_LIB_READLINE
AC_CHECK_FUNCS(strptime fmemopen gmtime_r wcstombs_l)
AC_CHECK_FUNCS(strptime fmemopen gmtime_r wcstombs_l vasprintf vasnprintf)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@ -74,14 +74,13 @@ if $YACC -V | grep "bison.* 3[.]" >/dev/null 2>&1; then
YFLAGS="$YFLAGS -Wno-yacc"
fi
else
sql=false
AC_MSG_WARN([Bison 3.0+ is not available: SQL disabled.])
sql=false
fi
if test "x$sql" = "xtrue"; then
CFLAGS="$CFLAGS -DSQL"
OPTDIRS="$OPTDIRS sql"
else
AC_MSG_WARN([Bison 3.0+ is not available: SQL disabled.])
fi
AM_CONDITIONAL(SQL, test x$sql = xtrue)