From 8ac8e1274a53897be6ea000eaf3b020dbc79fba9 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 17 Dec 2015 17:59:15 +0100
Subject: [PATCH] Fix vCard test suite no longer available since last commit

---
 configure.ac          | 1 +
 tester/Makefile.am    | 2 +-
 tester/vcard_tester.c | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2bd3f8de8..8a142d0d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -896,6 +896,7 @@ if test x$enable_vcard != xfalse; then
 		AC_LANG_C
 	fi
 	if test "$found_vcard" = "yes"; then
+		BELCARD_CFLAGS+=" -DVCARD_ENABLED"
 		enable_vcard=true
 	else
 		if test x$enable_vcard = xtrue; then
diff --git a/tester/Makefile.am b/tester/Makefile.am
index 043ec3045..1d255acdf 100644
--- a/tester/Makefile.am
+++ b/tester/Makefile.am
@@ -153,7 +153,7 @@ dist_liblinphone_tester_DATA =  tester_hosts messages.db
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/coreapi -I$(top_srcdir)/tester/common
 AM_CFLAGS    = -DBC_CONFIG_FILE=\"config.h\" $(STRICT_OPTIONS) $(STRICT_OPTIONS_CC) \
 		-DIN_LINPHONE $(ORTP_CFLAGS) $(MEDIASTREAMER_CFLAGS) $(CUNIT_CFLAGS) \
-		$(BELLESIP_CFLAGS) $(LIBXML2_CFLAGS) $(SQLITE3_CFLAGS)
+		$(BELLESIP_CFLAGS) $(LIBXML2_CFLAGS) $(SQLITE3_CFLAGS) $(BELCARD_CFLAGS)
 
 if BUILD_GTK_UI
 
diff --git a/tester/vcard_tester.c b/tester/vcard_tester.c
index 141c76c58..ac2173b3e 100644
--- a/tester/vcard_tester.c
+++ b/tester/vcard_tester.c
@@ -22,7 +22,7 @@
 
 #include <time.h>
 
-#if BUILD_VCARD
+#ifdef VCARD_ENABLED
 static char *create_filepath(const char *dir, const char *filename, const char *ext) {
 	return ms_strdup_printf("%s/%s.%s", dir, filename, ext);
 }
@@ -165,7 +165,7 @@ static void friends_sqlite_storage(void) {
 #endif
 
 test_t vcard_tests[] = {
-#if BUILD_VCARD
+#ifdef VCARD_ENABLED
 	{ "Import / Export friends from vCards", linphone_vcard_import_export_friends_test },
 	{ "Import a lot of friends from vCards", linphone_vcard_import_a_lot_of_friends_test },
 #ifdef FRIENDS_SQL_STORAGE_ENABLED