From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 21 Oct 2015 11:57:12 +0000 (+0100)
Subject: Add special hacks to allow static build.
X-Git-Tag: 1.0.7~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0646f71d680370e960bc52e45081fd65b60d782;p=thirdparty%2Frspamd.git

Add special hacks to allow static build.
---

diff --git a/contrib/aho-corasick/CMakeLists.txt b/contrib/aho-corasick/CMakeLists.txt
index d185245cbb..4b1a757736 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 4bc9f365c4..c381f4fa95 160000
--- a/contrib/snowball
+++ b/contrib/snowball
@@ -1 +1 @@
-Subproject commit 4bc9f365c4b674d0dd0cfd14c314a866f00e0883
+Subproject commit c381f4fa958b59d41b0c596f0cbfe3ed48831e93
diff --git a/doc/doxydown b/doc/doxydown
index 54377c45bb..6c1f79c429 160000
--- a/doc/doxydown
+++ b/doc/doxydown
@@ -1 +1 @@
-Subproject commit 54377c45bbdfa19df8c006f3b7377d222da51165
+Subproject commit 6c1f79c4294ef66a55bfc75845f3fdf3e2e1c32d