|
 |
5d6eedd |
From 25cd9391929a46f1f38daf6aa4421de6a1afc47e Mon Sep 17 00:00:00 2001
|
|
|
03e93e2 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
03e93e2 |
Date: Wed, 23 Nov 2016 10:18:30 -0500
|
|
 |
eaf2f30 |
Subject: [PATCH] build-sys: check for lz4 in the old and new numbering scheme
|
|
|
eaf2f30 |
(#4717)
|
|
|
eaf2f30 |
|
|
|
eaf2f30 |
lz4 upstream decided to switch to an incompatible numbering scheme
|
|
|
03e93e2 |
(1.7.3 follows 131, to match the so version).
|
|
|
03e93e2 |
PKG_CHECK_MODULES does not allow two version matches for the same package,
|
|
|
03e93e2 |
so e.g. lz4 < 10 || lz4 >= 125 cannot be used. Check twice, once for
|
|
|
03e93e2 |
"new" numbers (anything below 10 is assume to be new), once for the "old"
|
|
|
03e93e2 |
numbers (anything above >= 125). This assumes that the "new" versioning
|
|
|
03e93e2 |
will not get to 10 to quickly. I think that's a safe assumption, lz4 is a
|
|
|
03e93e2 |
mature project.
|
|
|
eaf2f30 |
|
|
|
eaf2f30 |
Fixed #4690.
|
|
|
03e93e2 |
(cherry picked from commit 3d4cf7de48a74726694abbaa09f9804b845ff3ba)
|
|
|
eaf2f30 |
---
|
|
|
eaf2f30 |
configure.ac | 9 ++++++---
|
|
|
eaf2f30 |
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
eaf2f30 |
|
|
|
eaf2f30 |
diff --git a/configure.ac b/configure.ac
|
|
|
03e93e2 |
index 0b10fc7de7..1928e65bde 100644
|
|
|
eaf2f30 |
--- a/configure.ac
|
|
|
eaf2f30 |
+++ b/configure.ac
|
|
|
03e93e2 |
@@ -623,10 +623,13 @@ AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"])
|
|
|
eaf2f30 |
have_lz4=no
|
|
|
eaf2f30 |
AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [Disable optional LZ4 support]))
|
|
|
eaf2f30 |
AS_IF([test "x$enable_lz4" != "xno"], [
|
|
|
eaf2f30 |
- PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
|
|
|
eaf2f30 |
- [AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available])
|
|
|
eaf2f30 |
+ PKG_CHECK_MODULES(LZ4, [ liblz4 < 10 ],
|
|
|
eaf2f30 |
+ [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
|
|
|
eaf2f30 |
have_lz4=yes],
|
|
|
eaf2f30 |
- have_lz4=no)
|
|
|
eaf2f30 |
+ [PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
|
|
|
eaf2f30 |
+ [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
|
|
|
eaf2f30 |
+ have_lz4=yes],
|
|
|
eaf2f30 |
+ have_lz4=no)])
|
|
|
eaf2f30 |
AS_IF([test "x$have_lz4" = xno -a "x$enable_lz4" = xyes],
|
|
|
eaf2f30 |
[AC_MSG_ERROR([*** LZ4 support requested but libraries not found])])
|
|
|
eaf2f30 |
])
|