Another round of linking issues fixup.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c54841a75b19c4accd4c275d0da5c40aaede64e..678d110ac9d65f6743535bee62d55d40672f6ecf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,7 +93,7 @@ ENDIF(NOT WWWDIR)
 IF(NOT LIBDIR)
        SET(RSPAMD_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/rspamd")
 ELSE(NOT LIBDIR)
-       SET(RSPAMD_LIBDIR "${LIBDIR}/rspamd")
+       SET(RSPAMD_LIBDIR "${LIBDIR}")
 ENDIF(NOT LIBDIR)
 SET(CMAKE_MACOSX_RPATH ON)
 SET(CMAKE_INSTALL_RPATH "${RSPAMD_LIBDIR}")
@@ -406,7 +406,7 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
        LIST(APPEND CMAKE_REQUIRED_LIBRARIES crypto)
        SET(CMAKE_VERBOSE_MAKEFILE ON)
        SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
-       SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/${LIBDIR}:${RSPAMD_LIBDIR}")
+       SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:${RSPAMD_LIBDIR}")
 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
 
 # Now find libraries and headers

diff --git a/contrib/aho-corasick/CMakeLists.txt b/contrib/aho-corasick/CMakeLists.txt
index d185245cbbc73811f00b5784254029329f6cfff4..7209c5094593bb4c67bd62bc53d3a1c7866ec93c 100644 (file)
--- a/contrib/aho-corasick/CMakeLists.txt
+++ b/contrib/aho-corasick/CMakeLists.txt
@@ -4,5 +4,6 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQU
        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
 endif ()
 ADD_LIBRARY(rspamd-actrie SHARED ${AHOCORASICSRC})
+TARGET_LINK_LIBRARIES(rspamd-actrie ${RSPAMD_REQUIRED_LIBRARIES})
 INSTALL(TARGETS rspamd-actrie
        LIBRARY DESTINATION ${RSPAMD_LIBDIR})