Add special hacks to allow static build.

diff --git a/contrib/aho-corasick/CMakeLists.txt b/contrib/aho-corasick/CMakeLists.txt
index d185245cbbc73811f00b5784254029329f6cfff4..4b1a757736b9372abaae7ddedacd80d799646170 100644 (file)
--- 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 4bc9f365c4b674d0dd0cfd14c314a866f00e0883..c381f4fa958b59d41b0c596f0cbfe3ed48831e93 160000 (submodule)
--- a/contrib/snowball
+++ b/contrib/snowball
@@ -1 +1 @@
-Subproject commit 4bc9f365c4b674d0dd0cfd14c314a866f00e0883
+Subproject commit c381f4fa958b59d41b0c596f0cbfe3ed48831e93

diff --git a/doc/doxydown b/doc/doxydown
index 54377c45bbdfa19df8c006f3b7377d222da51165..6c1f79c4294ef66a55bfc75845f3fdf3e2e1c32d 160000 (submodule)
--- a/doc/doxydown
+++ b/doc/doxydown
@@ -1 +1 @@
-Subproject commit 54377c45bbdfa19df8c006f3b7377d222da51165
+Subproject commit 6c1f79c4294ef66a55bfc75845f3fdf3e2e1c32d