SILC_DIST_VCARD changes.

diff --git a/includes/silc.h.in b/includes/silc.h.in
index accf52253b65e52d30cbe70023af67db24c19949..2efe2285ce92ad418fa31f09ae651895da7aee71 100644 (file)
--- a/includes/silc.h.in
+++ b/includes/silc.h.in
@@ -262,9 +262,12 @@ extern "C" {
 #include "silcfsm.h"
 #include "silcsocketstream.h"
 #include "silcfdstream.h"
-#include "silcvcard.h"
 #include "silcmime.h"
 
+#ifdef SILC_DIST_VCARD
+#include "silcvcard.h"
+#endif /* SILC_DIST_VCARD */
+
 #ifdef SILC_DIST_ASN1
 #include "silcasn1.h"
 #include "silcber.h"

diff --git a/lib/silccore/silcattrs.c b/lib/silccore/silcattrs.c
index 796f6255d3318732c0ffbe7ba47191c8d8c165ed..d40e53ac8495ec28080755834b9951d48d5b27e5 100644 (file)
--- a/lib/silccore/silcattrs.c
+++ b/lib/silccore/silcattrs.c
@@ -57,6 +57,7 @@ silc_attribute_payload_encode_int(SilcAttribute attribute,
 
     case SILC_ATTRIBUTE_USER_INFO:
       {
+#ifdef SILC_DIST_VCARD
        SilcVCard vcard = object;
        if (object_size != sizeof(*vcard))
          return NULL;
@@ -64,6 +65,7 @@ silc_attribute_payload_encode_int(SilcAttribute attribute,
        if (!str)
          return NULL;
        object = str;
+#endif /* SILC_DIST_VCARD */
       }
       break;
 
@@ -502,12 +504,14 @@ SilcBool silc_attribute_get_object(SilcAttributePayload payload,
   switch (payload->attribute) {
   case SILC_ATTRIBUTE_USER_INFO:
     {
+#ifdef SILC_DIST_VCARD
       SilcVCard vcard = object;
       if (object_size != sizeof(*vcard))
        break;
       if (!silc_vcard_decode(payload->data, payload->data_len, vcard))
        break;
       ret = TRUE;
+#endif /* SILC_DIST_VCARD */
     }
     break;