From: Sean Purcell <me@seanp.xyz>
Date: Thu, 20 Apr 2017 22:50:34 +0000 (-0700)
Subject: Don't try to use libzstd versions without streaming API
X-Git-Tag: v3.3.3~44^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a14c26bd0867186a9ddb75c0d4ec9df7b8503b1d;p=thirdparty%2Flibarchive.git

Don't try to use libzstd versions without streaming API
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b53f835a0..aadf9c45d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -546,10 +546,12 @@ FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd)
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR)
 IF(ZSTD_FOUND)
-  SET(HAVE_LIBZSTD 1)
   SET(HAVE_ZSTD_H 1)
   INCLUDE_DIRECTORIES(${ZSTD_INCLUDE_DIR})
   LIST(APPEND ADDITIONAL_LIBS ${ZSTD_LIBRARY})
+  SET(CMAKE_REQUIRED_LIBRARIES ${ZSTD_LIBRARY})
+  SET(CMAKE_REQUIRED_INCLUDES ${ZSTD_INCLUDE_DIR})
+  CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_LIBZSTD)
   #
   # TODO: test for static library.
   #
diff --git a/configure.ac b/configure.ac
index 5009644f7..5c4674af7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -372,7 +372,7 @@ AC_ARG_WITH([zstd],
 
 if test "x$with_zstd" != "xno"; then
   AC_CHECK_HEADERS([zstd.h])
-  AC_CHECK_LIB(zstd,ZSTD_decompress)
+  AC_CHECK_LIB(zstd,ZSTD_compressStream)
 fi
 
 AC_ARG_WITH([lzma],