]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Don't try to use libzstd versions without streaming API
authorSean Purcell <me@seanp.xyz>
Thu, 20 Apr 2017 22:50:34 +0000 (15:50 -0700)
committerSean Purcell <iburinoc@gmail.com>
Tue, 16 May 2017 03:06:48 +0000 (23:06 -0400)
CMakeLists.txt
configure.ac

index b53f835a07766923be6eb18f8171c14f98a1b650..aadf9c45d7e80aa822fd28626b1ef431892aeb94 100644 (file)
@@ -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.
   #
index 5009644f75483031ad5606e571ea637e56517f39..5c4674af7dccc494ed5c7fa75d8cad3ab124395f 100644 (file)
@@ -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],