(fix) enable S/MIME even when using GNU TLS (fixes #4201)

Conflicts: UI/MailPartViewers/UIxMailPartSignedViewer.m
Alinto · Jul 4, 2017 · 8d1b02d · 8d1b02d
1 parent 722c813
commit 8d1b02d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/UI/MailPartViewers/GNUmakefile.preamble b/UI/MailPartViewers/GNUmakefile.preamble
@@ -1,3 +1,13 @@
+ifeq ($(HAS_LIBRARY_gnutls),yes)
+ADDITIONAL_CPPFLAGS += -DHAVE_GNUTLS=1
+SOGo_LIBRARIES_DEPEND_UPON += -lgnutls
+else
+ifeq ($(HAS_LIBRARY_ssl),yes)
+ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
+SOGo_LIBRARIES_DEPEND_UPON += -lcrypto
+endif
+endif
+
 ifeq ($(HAS_LIBRARY_ssl),yes)
 ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
 BUNDLE_LIBS += -lcrypto

diff --git a/UI/MailPartViewers/UIxMailPartSignedViewer.m b/UI/MailPartViewers/UIxMailPartSignedViewer.m
@@ -21,8 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <stdio.h>
-#ifdef HAVE_OPENSSL
+#if defined(HAVE_OPENSSL) || defined(HAVE_GNUTLS)
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/pkcs7.h>
@@ -37,7 +36,8 @@
 
 @implementation UIxMailPartSignedViewer : UIxMailPartMixedViewer
 
-#ifdef HAVE_OPENSSL
+
+#if defined(HAVE_OPENSSL) || defined(HAVE_GNUTLS)
 - (BOOL) supportsSMIME
 {
   return YES;