diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-02-18 17:57:59 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-02-18 17:57:59 +0000 |
| commit | 667ffddf018da1b770dc709fcc051f6f483fd466 (patch) | |
| tree | d2eeaeb3f210aa12bde2137c878de40ef9bccba9 /CMakeLists.txt | |
| parent | c7283f8e50304ec0e0efa13a674ebe867f51be07 (diff) | |
| download | rspamd-667ffddf018da1b770dc709fcc051f6f483fd466.tar.gz rspamd-667ffddf018da1b770dc709fcc051f6f483fd466.zip | |
Remove judy and use glib hash tables.
There is no significant advantage to use Judy arrays over glib
HashTables to store hashes in fuzzy storage. Therefore, drop support of
Judy completely. Also rename `use_judy` parameter to `strict_hash`
indicating that hashes are matched strictly (not a fuzzy match but a hash
lookup).
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5eed2f089..1fcce10f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,6 @@ OPTION(ENABLE_REDIRECTOR "Enable redirector install [default: OFF]" OPTION(ENABLE_GPERF_TOOLS "Enable google perftools [default: OFF]" OFF) OPTION(ENABLE_STATIC "Enable static compiling [default: OFF]" OFF) OPTION(ENABLE_LUAJIT "Link with libluajit [default: OFF]" OFF) -OPTION(ENABLE_JUDY "Find and link with Judy library [default: ON]" ON) OPTION(ENABLE_DB "Find and link with DB library [default: OFF]" OFF) OPTION(ENABLE_SQLITE "Find and link with sqlite3 library [default: OFF]" OFF) OPTION(ENABLE_HIREDIS "Find and link with external redis library [default: OFF]" OFF) @@ -485,32 +484,6 @@ GET_FILENAME_COMPONENT(LIBEVENT_PATH "${LIBEVENT_LIBRARY}" PATH) INCLUDE_DIRECTORIES("${LIBEVENT_INCLUDE}") LINK_DIRECTORIES("${LIBEVENT_PATH}") -IF(ENABLE_JUDY MATCHES "ON") - # Find libjudy - FIND_LIBRARY(LIBJUDY_LIBRARY NAMES Judy PATH_SUFFIXES lib64 lib - PATHS - ~/Library/Frameworks - /Library/Frameworks - /usr/local - /usr - /sw - /opt/local - /opt/csw - /opt - DOC "Path where the libjudy library can be found") - IF(LIBJUDY_LIBRARY) - FIND_PATH(LIBJUDY_INCLUDE Judy.h PATHS /opt/include - /usr/include - /usr/local/include - DOC "Path where the judy header files can be found") - - GET_FILENAME_COMPONENT(LIBJUDY_PATH "${LIBJUDY_LIBRARY}" PATH) - INCLUDE_DIRECTORIES("${LIBJUDY_INCLUDE}") - LINK_DIRECTORIES("${LIBJUDY_PATH}") - SET(WITH_JUDY 1) - ENDIF(LIBJUDY_LIBRARY) -ENDIF(ENABLE_JUDY MATCHES "ON") - # Find libbd IF(ENABLE_DB MATCHES "ON") FIND_LIBRARY(LIBDB_LIBRARY NAMES db PATHS PATH_SUFFIXES lib64 lib @@ -960,10 +933,6 @@ TARGET_LINK_LIBRARIES(rspamd rspamd-server) TARGET_LINK_LIBRARIES(rspamd rspamd-util) TARGET_LINK_LIBRARIES(rspamd rspamd-lua) -IF(LIBJUDY_LIBRARY) - TARGET_LINK_LIBRARIES(rspamd Judy) -ENDIF(LIBJUDY_LIBRARY) - TARGET_LINK_LIBRARIES(rspamd event) IF(HAVE_LIBEVENT2) TARGET_LINK_LIBRARIES(rspamd event_pthreads) |