[Minor] Redis support is now unconditional

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8c4cca1aa9d7a04473b0b99322867773c857d706..223ae76cf046981e52718366d9e879ca3692283d 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -43,7 +43,7 @@ jobs:
       - run: sudo apt-get install -qq cmake libevent-dev libglib2.0-dev libicu-dev libluajit-5.1-dev libmagic-dev libsqlite3-dev libssl-dev ragel
 
       - run: mkdir ../build ; mkdir ../install ; cd ../build
-      - run: cmake ../project -DDBDIR=/nana -DENABLE_COVERAGE=ON -DCMAKE_INSTALL_PREFIX=../install -DENABLE_HIREDIS=ON
+      - run: cmake ../project -DDBDIR=/nana -DENABLE_COVERAGE=ON -DCMAKE_INSTALL_PREFIX=../install
 
       - run: make install -j`nproc`
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2afc8443f8c38f9d752ab2a4f8bacc26b09b5a6d..a1961a16da4b69617a4ab9c5fc2dd557a9bd9417 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1254,9 +1254,7 @@ ADD_SUBDIRECTORY(contrib/t1ha)
 IF (ENABLE_SNOWBALL MATCHES "ON")
        LIST(APPEND RSPAMD_REQUIRED_LIBRARIES stemmer)
 ENDIF()
-IF(ENABLE_HIREDIS MATCHES "ON")
-       LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-hiredis)
-ENDIF()
+LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-hiredis)
 IF(ENABLE_HYPERSCAN MATCHES "OFF")
        LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-actrie)
 ENDIF()

diff --git a/debian/rules b/debian/rules
index a51894f38da46512a50b949190734d7d1d1717f8..5cde81db5d3f84560d3807208665629ae54a6ef5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,6 @@ override_dh_auto_configure:
                -DENABLE_FULL_DEBUG=OFF \
                -DENABLE_GD=OFF \
                -DENABLE_PCRE2=OFF \
-               -DENABLE_HIREDIS=ON \
                -DENABLE_LUAJIT=ON \
                -DENABLE_TORCH=ON \
                -DENABLE_LIBUNWIND=ON \

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f01f7a45cff782ce11ef6341432284646004a14a..0f9cbd668b7c16ee91597e0df48a087996bbfc20 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -171,9 +171,7 @@ TARGET_LINK_LIBRARIES(rspamd rspamd-server)
 IF (ENABLE_SNOWBALL MATCHES "ON")
        TARGET_LINK_LIBRARIES(rspamd stemmer)
 ENDIF()
-IF(ENABLE_HIREDIS MATCHES "ON")
-       TARGET_LINK_LIBRARIES(rspamd rspamd-hiredis)
-ENDIF()
+TARGET_LINK_LIBRARIES(rspamd rspamd-hiredis)
 
 IF (ENABLE_FANN MATCHES "ON")
        TARGET_LINK_LIBRARIES(rspamd fann)

diff --git a/src/libserver/CMakeLists.txt b/src/libserver/CMakeLists.txt
index 03d11acb693469901ec5ae3d54b6c516be90bda7..ac2c123dc29e4d1d1ba67cb3a68194b0221d4979 100644 (file)
--- a/src/libserver/CMakeLists.txt
+++ b/src/libserver/CMakeLists.txt
@@ -21,10 +21,8 @@ SET(LIBRSPAMDSERVERSRC
                                ${CMAKE_CURRENT_SOURCE_DIR}/url.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/worker_util.c)
 
-IF (ENABLE_HIREDIS MATCHES "ON")
-       LIST(APPEND LIBRSPAMDSERVERSRC "${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend_redis.c")
-       LIST(APPEND LIBRSPAMDSERVERSRC "${CMAKE_CURRENT_SOURCE_DIR}/redis_pool.c")
-ENDIF ()
+LIST(APPEND LIBRSPAMDSERVERSRC "${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend_redis.c")
+LIST(APPEND LIBRSPAMDSERVERSRC "${CMAKE_CURRENT_SOURCE_DIR}/redis_pool.c")
 
 # Librspamd-server
 SET(RSPAMD_SERVER ${LIBRSPAMDSERVERSRC} PARENT_SCOPE)

diff --git a/src/libstat/CMakeLists.txt b/src/libstat/CMakeLists.txt
index 0bc92061657767a33db6b1c31c350c61ef1364a2..1019a99256294e6d9137e234992a39992549912b 100644 (file)
--- a/src/libstat/CMakeLists.txt
+++ b/src/libstat/CMakeLists.txt
@@ -12,12 +12,10 @@ SET(BACKENDSSRC     ${CMAKE_CURRENT_SOURCE_DIR}/backends/mmaped_file.c
                                        ${CMAKE_CURRENT_SOURCE_DIR}/backends/sqlite3_backend.c)
 SET(CACHESSRC  ${CMAKE_CURRENT_SOURCE_DIR}/learn_cache/sqlite3_cache.c)
 
-IF(ENABLE_HIREDIS MATCHES "ON")
-       SET(BACKENDSSRC         ${BACKENDSSRC}
-                                       ${CMAKE_CURRENT_SOURCE_DIR}/backends/redis_backend.c)
-       SET(CACHESSRC   ${CACHESSRC}
-                                       ${CMAKE_CURRENT_SOURCE_DIR}/learn_cache/redis_cache.c)
-ENDIF(ENABLE_HIREDIS MATCHES "ON")
+SET(BACKENDSSRC        ${BACKENDSSRC}
+               ${CMAKE_CURRENT_SOURCE_DIR}/backends/redis_backend.c)
+SET(CACHESSRC  ${CACHESSRC}
+               ${CMAKE_CURRENT_SOURCE_DIR}/learn_cache/redis_cache.c)
 
 
 SET(RSPAMD_STAT ${LIBSTATSRC}

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 71a412d84cc2613c2dc8ea63f4f72d2d50dbd79d..f2d84652568cd691f95c9bb527f8c790e380d49c 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -33,9 +33,7 @@ TARGET_LINK_LIBRARIES(rspamd-test ${RSPAMD_REQUIRED_LIBRARIES})
 IF (ENABLE_SNOWBALL MATCHES "ON")
        TARGET_LINK_LIBRARIES(rspamd-test stemmer)
 ENDIF()
-IF(ENABLE_HIREDIS MATCHES "ON")
-       TARGET_LINK_LIBRARIES(rspamd-test rspamd-hiredis)
-ENDIF()
+TARGET_LINK_LIBRARIES(rspamd-test rspamd-hiredis)
 IF (ENABLE_HYPERSCAN MATCHES "ON")
        TARGET_LINK_LIBRARIES(rspamd-test hs)
 ENDIF()

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 0f65b06ceb5163e5886e96fe77853c4a870cb546..036365439375d74561de44f402fde0c00a082430 100644 (file)
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -16,9 +16,7 @@ MACRO(ADD_UTIL NAME)
        IF (ENABLE_SNOWBALL MATCHES "ON")
        TARGET_LINK_LIBRARIES("${NAME}" stemmer)
        ENDIF()
-       IF(ENABLE_HIREDIS MATCHES "ON")
-               TARGET_LINK_LIBRARIES("${NAME}" rspamd-hiredis)
-       ENDIF()
+       TARGET_LINK_LIBRARIES("${NAME}" rspamd-hiredis)
        TARGET_LINK_LIBRARIES(${NAME} rspamd-linenoise)
        TARGET_LINK_LIBRARIES("${NAME}" ${RSPAMD_REQUIRED_LIBRARIES})
 ENDMACRO()