From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 8 Jul 2015 13:15:46 +0000 (+0100)
Subject: Fix openssl handling.
X-Git-Tag: 1.0.0~421
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d5ca1753f540e71babc7c94563ec69852f7a8e9;p=thirdparty%2Frspamd.git

Fix openssl handling.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fb1cc5e09..01d5563cc7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -544,12 +544,6 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
 	ENDIF(NOT LUA_FOUND)
 ENDIF(ENABLE_LUAJIT MATCHES "ON")
 
-#Check for openssl (required for dkim)
-IF(OPENSSL_FOUND)
-	SET(HAVE_OPENSSL 1)
-	INCLUDE_DIRECTORIES("${OPENSSL_INCLUDE_DIR}")
-ENDIF(OPENSSL_FOUND)
-
 ProcessPackage(GLIB2 LIBRARY glib-2.0 INCLUDE glib.h INCLUDE_SUFFIXES include/glib 
 	ROOT ${GLIB_ROOT_DIR} MODULES glib-2.0>=2.28)
 ProcessPackage(PCRE LIBRARY pcre INCLUDE pcre.h INCLUDE_SUFFIXES include/pcre 
@@ -565,6 +559,11 @@ ProcessPackage(ICONV LIBRARY iconv libiconv libiconv-2 c INCLUDE iconv.h INCLUDE
 ProcessPackage(OPENSSL LIBRARY crypto INCLUDE opensslconf.h INCLUDE_SUFFIXES include/openssl
 	ROOT ${OPENSSL_ROOT_DIR} MODULES openssl)
 
+#Check for openssl (required for dkim)
+IF(OPENSSL_FOUND)
+	SET(HAVE_OPENSSL 1)
+ENDIF(OPENSSL_FOUND)
+
 IF(GMIME2_VERSION VERSION_GREATER "2.4.0" OR NOT GMIME2_VERSION)
 	SET(GMIME24 1)
 ENDIF()