From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 30 Aug 2016 17:36:14 +0000 (+0100)
Subject: [Fix] Do not be cheated by system hiredis
X-Git-Tag: 1.4.0~522
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=798d515290f2fcb326eab08399d1e677eb742a55;p=thirdparty%2Frspamd.git

[Fix] Do not be cheated by system hiredis
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0be84d60e..f0749f8061 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -476,7 +476,8 @@ ENDMACRO()
 # Initial set
 
 # Prefer local include dirs to system ones
-INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/src"
+INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
+		"${CMAKE_SOURCE_DIR}/src"
 		"${CMAKE_SOURCE_DIR}/src/libutil"
 		"${CMAKE_SOURCE_DIR}/src/libserver"
 		"${CMAKE_SOURCE_DIR}/src/libmime"
diff --git a/src/libserver/redis_pool.c b/src/libserver/redis_pool.c
index 8ef0f9ad58..aeb8dbeae6 100644
--- a/src/libserver/redis_pool.c
+++ b/src/libserver/redis_pool.c
@@ -18,11 +18,12 @@
 #include <event.h>
 #include "redis_pool.h"
 #include "cfg_file.h"
-#include "hiredis/hiredis.h"
-#include "hiredis/async.h"
-#include "hiredis/adapters/libevent.h"
+#include "contrib/hiredis/hiredis.h"
+#include "contrib/hiredis/async.h"
+#include "contrib/hiredis/adapters/libevent.h"
 #include "cryptobox.h"
 #include "ref.h"
+#include "logger.h"
 
 struct rspamd_redis_pool_elt;
 
diff --git a/src/lua/lua_redis.c b/src/lua/lua_redis.c
index b7fb8f6c40..815192d27c 100644
--- a/src/lua/lua_redis.c
+++ b/src/lua/lua_redis.c
@@ -17,8 +17,8 @@
 #include "dns.h"
 #include "utlist.h"
 
-#include "hiredis/hiredis.h"
-#include "hiredis/async.h"
+#include "contrib/hiredis/hiredis.h"
+#include "contrib/hiredis/async.h"
 
 #define REDIS_DEFAULT_TIMEOUT 1.0