From c0646f71d680370e960bc52e45081fd65b60d782 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Wed, 21 Oct 2015 12:57:12 +0100 Subject: [PATCH] Add special hacks to allow static build. --- contrib/aho-corasick/CMakeLists.txt | 12 +++++++++--- contrib/snowball | 2 +- doc/doxydown | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/contrib/aho-corasick/CMakeLists.txt b/contrib/aho-corasick/CMakeLists.txt index d185245cb..4b1a75773 100644 --- a/contrib/aho-corasick/CMakeLists.txt +++ b/contrib/aho-corasick/CMakeLists.txt @@ -3,6 +3,12 @@ SET(AHOCORASICSRC acism_create.c if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") endif () -ADD_LIBRARY(rspamd-actrie SHARED ${AHOCORASICSRC}) -INSTALL(TARGETS rspamd-actrie - LIBRARY DESTINATION ${RSPAMD_LIBDIR}) + +IF(NOT GPL_RSPAMD_BINARY) + ADD_LIBRARY(rspamd-actrie SHARED ${AHOCORASICSRC}) + + INSTALL(TARGETS rspamd-actrie + LIBRARY DESTINATION ${RSPAMD_LIBDIR}) +ELSE() + ADD_LIBRARY(rspamd-actrie STATIC ${AHOCORASICSRC}) +ENDIF() diff --git a/contrib/snowball b/contrib/snowball index 4bc9f365c..c381f4fa9 160000 --- a/contrib/snowball +++ b/contrib/snowball @@ -1 +1 @@ -Subproject commit 4bc9f365c4b674d0dd0cfd14c314a866f00e0883 +Subproject commit c381f4fa958b59d41b0c596f0cbfe3ed48831e93 diff --git a/doc/doxydown b/doc/doxydown index 54377c45b..6c1f79c42 160000 --- a/doc/doxydown +++ b/doc/doxydown @@ -1 +1 @@ -Subproject commit 54377c45bbdfa19df8c006f3b7377d222da51165 +Subproject commit 6c1f79c4294ef66a55bfc75845f3fdf3e2e1c32d -- 2.39.5