Fixed build issues when disabling messaging features.

4 files changed, 32 insertions, 2 deletions

diff --git a/src/vmime/net/messageSet.cpp b/src/vmime/net/messageSet.cpp
index 64b4aa3a..8a923a3f 100644
--- a/src/vmime/net/messageSet.cpp
+++ b/src/vmime/net/messageSet.cpp
@@ -21,6 +21,12 @@
 // the GNU General Public License cover the whole combination.
 //
 
+#include "vmime/config.hpp"
+
+
+#if VMIME_HAVE_MESSAGING_FEATURES
+
+
 #include "vmime/net/messageSet.hpp"
 
 #include <iterator>
@@ -386,3 +392,6 @@ const messageRange& messageSet::getRangeAt(const size_t i) const
 
 } // net
 } // vmime
+
+
+#endif // VMIME_HAVE_MESSAGING_FEATURES
diff --git a/src/vmime/net/messageSet.hpp b/src/vmime/net/messageSet.hpp
index a096b1c7..dbe1cce3 100644
--- a/src/vmime/net/messageSet.hpp
+++ b/src/vmime/net/messageSet.hpp
@@ -25,6 +25,12 @@
 #define VMIME_NET_MESSAGESET_HPP_INCLUDED
 
 
+#include "vmime/config.hpp"
+
+
+#if VMIME_HAVE_MESSAGING_FEATURES
+
+
 #include "vmime/net/message.hpp"
 
 
@@ -351,4 +357,7 @@ private:
 } // vmime
 
 
+#endif // VMIME_HAVE_MESSAGING_FEATURES
+
+
 #endif // VMIME_NET_MESSAGESET_HPP_INCLUDED
diff --git a/src/vmime/security/cert/defaultCertificateVerifier.cpp b/src/vmime/security/cert/defaultCertificateVerifier.cpp
index 82e8455a..6c3e1128 100644
--- a/src/vmime/security/cert/defaultCertificateVerifier.cpp
+++ b/src/vmime/security/cert/defaultCertificateVerifier.cpp
@@ -23,7 +23,9 @@
 
 #include "vmime/config.hpp"
 
-#if VMIME_HAVE_TLS_SUPPORT
+
+#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_TLS_SUPPORT
+
 
 #include "vmime/security/cert/defaultCertificateVerifier.hpp"
 
@@ -172,4 +174,5 @@ void defaultCertificateVerifier::setX509TrustedCerts
 } // security
 } // vmime
 
-#endif
+
+#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_TLS_SUPPORT
diff --git a/src/vmime/security/cert/defaultCertificateVerifier.hpp b/src/vmime/security/cert/defaultCertificateVerifier.hpp
index fddcc4f5..8de43714 100644
--- a/src/vmime/security/cert/defaultCertificateVerifier.hpp
+++ b/src/vmime/security/cert/defaultCertificateVerifier.hpp
@@ -25,6 +25,12 @@
 #define VMIME_SECURITY_CERT_DEFAULTCERTIFICATEVERIFIER_HPP_INCLUDED
 
 
+#include "vmime/config.hpp"
+
+
+#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_TLS_SUPPORT
+
+
 #include "vmime/security/cert/certificateVerifier.hpp"
 
 
@@ -85,5 +91,8 @@ private:
 } // vmime
 
 
+#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_TLS_SUPPORT
+
+
 #endif // VMIME_SECURITY_CERT_DEFAULTCERTIFICATEVERIFIER_HPP_INCLUDED