Fix compile errors with cmake and when zstd isn't present

diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
index db239240b04f3e9fe6e82c18f42dc013649b0173..1e561f3f6d25bc4c919080d3701f0677e5f2a1ba 100644 (file)
--- a/libarchive/CMakeLists.txt
+++ b/libarchive/CMakeLists.txt
@@ -130,6 +130,7 @@ SET(libarchive_SOURCES
   archive_write_add_filter_gzip.c
   archive_write_add_filter_lrzip.c
   archive_write_add_filter_lz4.c
+  archive_write_add_filter_zstd.c
   archive_write_add_filter_lzop.c
   archive_write_add_filter_none.c
   archive_write_add_filter_program.c

diff --git a/libarchive/archive_write_add_filter_zstd.c b/libarchive/archive_write_add_filter_zstd.c
index 29ba6ccadfe90ef9279b140a9c807a8fb27413bf..2b56040a035393ce5a2ba95cdd63f59155c464fd 100644 (file)
--- a/libarchive/archive_write_add_filter_zstd.c
+++ b/libarchive/archive_write_add_filter_zstd.c
@@ -147,7 +147,12 @@ archive_compressor_zstd_options(struct archive_write_filter *f, const char *key,
 
        if (strcmp(key, "compression-level") == 0) {
                int level = atoi(value);
+#if HAVE_ZSTD_H && HAVE_LIBZSTD
                if (level < 1 || level > ZSTD_maxCLevel()) {
+#else
+               /* If we don't have the library, hard-code the max level */
+               if (level < 1 || level > 22) {
+#endif
                        return (ARCHIVE_WARN);
                }
                data->compression_level = level;