From: Pekka Riikonen <priikone@silcnet.org>
Date: Sun, 4 Nov 2007 09:20:20 +0000 (+0000)
Subject: 	SILC_DIST_VCARD changes.
X-Git-Tag: silc.server.1.1.beta.2~1
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=42de8cd4d67dfa96a992a69f74c436439419f20b

	SILC_DIST_VCARD changes.
---

diff --git a/includes/silc.h.in b/includes/silc.h.in
index accf5225..2efe2285 100644
--- 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 796f6255..d40e53ac 100644
--- 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;