Link libcurl/fetch to rcl directly.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2be7bad499a7cac9753da31c73102bba8dfdb9b..a14e44383b6183f8455d688e3d2bf18b4735f827 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1120,6 +1120,13 @@ ELSE(GMIME24)
        TARGET_LINK_LIBRARIES(rspamd ${GMIME2_LIBRARIES})
 ENDIF(GMIME24)
 TARGET_LINK_LIBRARIES(rspamd ${GLIB2_LIBRARIES})
+IF(HAVE_FETCH_H)
+       TARGET_LINK_LIBRARIES(rspamd fetch)
+ELSE(HAVE_FETCH_H)
+       IF(CURL_FOUND)
+               TARGET_LINK_LIBRARIES(rspamd ${CURL_LIBRARIES})
+       ENDIF(CURL_FOUND)
+ENDIF(HAVE_FETCH_H)
 TARGET_LINK_LIBRARIES(rspamd ${CMAKE_REQUIRED_LIBRARIES})
 
 IF(ENABLE_STATIC MATCHES "ON")

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index c4b29d933441bf2d95e5b9f2e2521ca8f4ffd08d..af140352306cec244defb2090ee6ffa8b7b0d62c 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -77,13 +77,6 @@ TARGET_LINK_LIBRARIES(rspamd-util ${CMAKE_REQUIRED_LIBRARIES})
 TARGET_LINK_LIBRARIES(rspamd-util pcre)
 TARGET_LINK_LIBRARIES(rspamd-util ${GLIB2_LIBRARIES})
 TARGET_LINK_LIBRARIES(rspamd-util event)
-IF(HAVE_FETCH_H)
-       TARGET_LINK_LIBRARIES(rspamd-util fetch)
-ELSE(HAVE_FETCH_H)
-       IF(CURL_FOUND)
-               TARGET_LINK_LIBRARIES(rspamd-util ${CURL_LIBRARIES})
-       ENDIF(CURL_FOUND)
-ENDIF(HAVE_FETCH_H)
 
 IF(NOT DEBIAN_BUILD)
 SET_TARGET_PROPERTIES(rspamd-util PROPERTIES VERSION ${RSPAMD_VERSION})

diff --git a/src/rcl/CMakeLists.txt b/src/rcl/CMakeLists.txt
index d5a362449f8a5d80b3eb060b39aedf2995d12875..134db7269e371e6611c57a3634bad484193bb09e 100644 (file)
--- a/src/rcl/CMakeLists.txt
+++ b/src/rcl/CMakeLists.txt
@@ -6,6 +6,13 @@ SET(RCLSRC                       rcl_util.c
 ADD_LIBRARY(rspamd-rcl ${LINK_TYPE} ${RCLSRC})
 SET_TARGET_PROPERTIES(rspamd-rcl PROPERTIES VERSION ${RSPAMD_VERSION})
 SET_TARGET_PROPERTIES(rspamd-rcl PROPERTIES COMPILE_FLAGS "-DRSPAMD_LIB")
+IF(HAVE_FETCH_H)
+       TARGET_LINK_LIBRARIES(rspamd-rcl fetch)
+ELSE(HAVE_FETCH_H)
+       IF(CURL_FOUND)
+               TARGET_LINK_LIBRARIES(rspamd-rcl ${CURL_LIBRARIES})
+       ENDIF(CURL_FOUND)
+ENDIF(HAVE_FETCH_H)
 IF(NO_SHARED MATCHES "OFF")
        INSTALL(TARGETS rspamd-rcl 
        LIBRARY DESTINATION ${LIBDIR}