LZ4 changed versioning scheme from r131 to v1.7.3 making our configure
fail with (1.7.3 < 129).
Switch from version checking to checking that the necessary function
is available.
---
m4/spice-deps.m4 | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4
index 54e0d82..3b22422 100644
--- a/m4/spice-deps.m4
+++ b/m4/spice-deps.m4
@@ -184,12 +184,26 @@ AC_DEFUN([SPICE_CHECK_LZ4], [
have_lz4="no"
if test "x$enable_lz4" != "xno"; then
- PKG_CHECK_MODULES([LZ4], [liblz4 >= 129], [have_lz4="yes"], [have_lz4="no"])
+ # LZ4_compress_default is available in liblz4 >= 129, however liblz has changed
+ # versioning scheme making the check failing. Rather check for function definition
+ PKG_CHECK_MODULES([LZ4], [liblz4], [have_lz4="yes"], [have_lz4="no"])
if test "x$have_lz4" = "xyes"; then
- AC_DEFINE(USE_LZ4, [1], [Define to build with lz4 support])
- elif test "x$enable_lz4" = "xyes"; then
- AC_MSG_ERROR([lz4 support requested but liblz4 could not be found])
+ # It is necessary to set LIBS and CFLAGS before AC_CHECK_FUNC
+ old_LIBS="$LIBS"
+ old_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $LZ4_CFLAGS"
+ LIBS="$LIBS $LZ4_LIBS"
+
+ AC_CHECK_FUNC([LZ4_compress_default], [
+ AC_DEFINE(USE_LZ4, [1], [Define to build with lz4 support])],
+ [have_lz4="no"])
+
+ LIBS="$old_LIBS"
+ CFLAGS="$old_CFLAGS"
+ fi
+ if test "x$enable_lz4" = "xyes" && test "x$have_lz4" = "xno"; then
+ AC_MSG_ERROR([lz4 support requested but liblz4 >= 129 could not be found])
fi
fi
AM_CONDITIONAL(HAVE_LZ4, test "x$have_lz4" = "xyes")
--
2.10.2
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel