1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77ad86785..56246807e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,6 +202,8 @@ ELSE()
ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
ENDIF()
+ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h
+ ROOT ${ZSTD_ROOT_DIR} MODULES libzstd)
ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite
ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite)
ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h
@@ -619,7 +621,6 @@ ADD_SUBDIRECTORY(contrib/http-parser)
ADD_SUBDIRECTORY(contrib/fpconv)
ADD_SUBDIRECTORY(contrib/lc-btrie)
ADD_SUBDIRECTORY(contrib/libottery)
-ADD_SUBDIRECTORY(contrib/zstd)
IF(ENABLE_SNOWBALL MATCHES "ON")
ADD_SUBDIRECTORY(contrib/snowball)
SET(WITH_SNOWBALL 1)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 54b2e4083..e0e2edd58 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -181,7 +181,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser)
TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv)
TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb)
TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
-TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8)
IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c
index bcb25672e..48ca58e94 100644
--- a/src/client/rspamdclient.c
+++ b/src/client/rspamdclient.c
@@ -19,7 +19,7 @@
#include "libserver/http/http_private.h"
#include "libserver/protocol_internal.h"
#include "unix-std.h"
-#include "contrib/zstd/zstd.h"
+#include <zstd.h>
#ifdef HAVE_FETCH_H
#include <fetch.h>
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 987123cbb..51c2e1468 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -36,8 +36,7 @@
#include "contrib/libottery/ottery.h"
#include "contrib/fastutf8/fastutf8.h"
-#define ZSTD_STATIC_LINKING_ONLY
-#include "contrib/zstd/zstd.h"
+#include <zstd.h>
#ifdef HAVE_OPENSSL
#include <openssl/rand.h>
diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c
index 14792753a..20ca8416e 100644
--- a/src/libserver/maps/map.c
+++ b/src/libserver/maps/map.c
@@ -23,7 +23,7 @@
#include "libserver/http/http_connection.h"
#include "libserver/http/http_private.h"
#include "rspamd.h"
-#include "contrib/zstd/zstd.h"
+#include <zstd.h>
#include "contrib/libev/ev.h"
#include "contrib/uthash/utlist.h"
diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 31b0308cb..62ba3d833 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -21,7 +21,7 @@
#include "worker_private.h"
#include "libserver/cfg_file_private.h"
#include "libmime/scan_result_private.h"
-#include "contrib/zstd/zstd.h"
+#include <zstd.h>
#include "lua/lua_common.h"
#include "unix-std.h"
#include "protocol_internal.h"
diff --git a/src/libserver/task.c b/src/libserver/task.c
index 096933803..f78754ab4 100644
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -25,7 +25,7 @@
#include "stat_api.h"
#include "unix-std.h"
#include "utlist.h"
-#include "contrib/zstd/zstd.h"
+#include <zstd.h>
#include "libserver/mempool_vars_internal.h"
#include "libserver/cfg_file_private.h"
#include "libmime/lang_detection.h"
diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
index e879d37af..88451e222 100644
--- a/src/lua/lua_util.c
+++ b/src/lua/lua_util.c
@@ -15,7 +15,7 @@
*/
#include "lua_common.h"
#include "unix-std.h"
-#include "contrib/zstd/zstd.h"
+#include <zstd.h>
#include "libmime/email_addr.h"
#include "libmime/content_type.h"
#include "libmime/mime_headers.h"
diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c
index 3fa5da390..c641fb263 100644
--- a/src/rspamd_proxy.c
+++ b/src/rspamd_proxy.c
@@ -36,7 +36,7 @@
#include "libserver/milter.h"
#include "libserver/milter_internal.h"
#include "libmime/lang_detection.h"
-#include "contrib/zstd/zstd.h"
+#include <zstd.h>
#include <math.h>
|
