Add rdns as a submodule.

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..cee33c6
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/rdns"]
+       path = src/rdns
+       url = git://github.com/vstakhov/librdns

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42ca9f4b356b1206b7c00e8b70a0e4780e2152a9..30583c86f6b6144ebbfb08b4955e900822009afe 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -898,6 +898,10 @@ ADD_SUBDIRECTORY(src/ucl)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(src/client)
 
+SET(SLAVE_BUILD 1)
+ADD_SUBDIRECTORY(src/rdns)
+UNSET(SLAVE_BUILD)
+
 ADD_SUBDIRECTORY(test)
 
 LIST(LENGTH PLUGINSSRC RSPAMD_MODULES_NUM)

diff --git a/contrib/libottery/CMakeLists.txt b/contrib/libottery/CMakeLists.txt
index 499a080b3bc81048016a865e48a82b4034b81a7c..52667ff840874acc91b778e6ae6d4c6ec089c9c9 100644 (file)
--- a/contrib/libottery/CMakeLists.txt
+++ b/contrib/libottery/CMakeLists.txt
@@ -4,12 +4,4 @@ SET(OTTERYSRC            chacha_merged.c
                          ottery_entropy.c
                          ottery_global.c)
 
-ADD_LIBRARY(rspamd-ottery ${LINK_TYPE} ${OTTERYSRC})
-SET_TARGET_PROPERTIES(rspamd-ottery PROPERTIES VERSION ${RSPAMD_VERSION})
-SET_TARGET_PROPERTIES(rspamd-ottery PROPERTIES COMPILE_FLAGS "-DRSPAMD_LIB")
-
-IF(NO_SHARED MATCHES "OFF")
-    INSTALL(TARGETS rspamd-ottery
-        LIBRARY DESTINATION ${LIBDIR}
-        PUBLIC_HEADER DESTINATION ${INCLUDEDIR})
-ENDIF(NO_SHARED MATCHES "OFF")  
\ No newline at end of file
+ADD_LIBRARY(ottery STATIC ${OTTERYSRC})  
\ No newline at end of file

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 358b130b0873f14bceefd963a68ba437cb0dea5d..84f9806558f9aeb28f6a44c712cddf20d36bebef 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -67,7 +67,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
 TARGET_LINK_LIBRARIES(rspamd-util ${RSPAMD_REQUIRED_LIBRARIES})
 TARGET_LINK_LIBRARIES(rspamd-util pcre)
 TARGET_LINK_LIBRARIES(rspamd-util rspamd-ucl)
-TARGET_LINK_LIBRARIES(rspamd-util rspamd-ottery)
+TARGET_LINK_LIBRARIES(rspamd-util ottery)
 TARGET_LINK_LIBRARIES(rspamd-util rspamd-http-parser)
 TARGET_LINK_LIBRARIES(rspamd-util event)
 TARGET_LINK_LIBRARIES(rspamd-util xxhash)

diff --git a/src/rdns b/src/rdns
new file mode 160000 (submodule)
index 0000000..9f1eef2
--- /dev/null
+++ b/src/rdns
@@ -0,0 +1 @@
+Subproject commit 9f1eef254576b6a632c96d7e8117c75b5e4ec0be