From a14c26bd0867186a9ddb75c0d4ec9df7b8503b1d Mon Sep 17 00:00:00 2001 From: Sean Purcell Date: Thu, 20 Apr 2017 15:50:34 -0700 Subject: [PATCH] Don't try to use libzstd versions without streaming API --- CMakeLists.txt | 4 +++- configure.ac | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) 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], -- 2.47.2