[evolution-activesync] restore compatibility with EDS 3.4

[Patrick Ohly <pohly src gnome org>]

commit a84ec46ad100ebafebfe4e7d31f3f3fe74a6f099
Author: Patrick Ohly <patrick ohly intel com>
Date:   Mon May 13 08:16:23 2013 -0700

    restore compatibility with EDS 3.4
    
    EDS 3.4 does not yet have the unified header files. We can (and should) only
    include them if the version check from eds-version.h (which is always
    available and usable directly) tells us that EDS is recent enough.
    
    A compile-time check is used instead of a configure check to avoid making
    the header files depend on config.h and a specific check, because that might
    not work if the header files are used inside a client app. Not sure whether
    that is ever the case - better safe than sorry.

 eas-daemon/libeas/eas-con-info-translator.c |    7 ++++++-
 eas-daemon/libeas/eas-connection.c          |    7 ++++++-
 eas-daemon/libeas/eas-request-base.h        |    7 ++++++-
 libeasaccount/src/eas-account-list.h        |    7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/eas-daemon/libeas/eas-con-info-translator.c b/eas-daemon/libeas/eas-con-info-translator.c
index 2ec9ce9..23a3786 100644
--- a/eas-daemon/libeas/eas-con-info-translator.c
+++ b/eas-daemon/libeas/eas-con-info-translator.c
@@ -51,7 +51,12 @@
 
 #include "eas-con-info-translator.h"
 
-#include <libebook/libebook.h>
+#include <libedataserver/eds-version.h>
+#if EDS_CHECK_VERSION(3,6,0)
+# include <libebook/libebook.h>
+#else
+# include <libebook/e-vcard.h>
+#endif
 #include <string.h>
 
 // EAS string value definitions
diff --git a/eas-daemon/libeas/eas-connection.c b/eas-daemon/libeas/eas-connection.c
index a95e583..b373fea 100644
--- a/eas-daemon/libeas/eas-connection.c
+++ b/eas-daemon/libeas/eas-connection.c
@@ -59,7 +59,12 @@
 #include <libsoup/soup.h>
 
 #include <wbxml/wbxml.h>
-#include <libedataserver/libedataserver.h>
+#include <libedataserver/eds-version.h>
+#if EDS_CHECK_VERSION(3,6,0)
+# include <libedataserver/libedataserver.h>
+#else
+# include <libedataserver/e-flag.h>
+#endif
 #include <libxml/xmlreader.h> // xmlDoc
 #include <time.h>
 #include <unistd.h>
diff --git a/eas-daemon/libeas/eas-request-base.h b/eas-daemon/libeas/eas-request-base.h
index 98ec2e2..49f3447 100644
--- a/eas-daemon/libeas/eas-request-base.h
+++ b/eas-daemon/libeas/eas-request-base.h
@@ -55,7 +55,12 @@
 #include <glib-object.h>
 #include <libsoup/soup.h>
 #include <libxml/xmlreader.h> // xmlDoc
-#include <libedataserver/libedataserver.h>
+#include <libedataserver/eds-version.h>
+#if EDS_CHECK_VERSION(3,6,0)
+# include <libedataserver/libedataserver.h>
+#else
+# include <libedataserver/e-flag.h>
+#endif
 #include "eas-connection.h"
 #include <dbus/dbus-glib.h>
 #include <string.h>
diff --git a/libeasaccount/src/eas-account-list.h b/libeasaccount/src/eas-account-list.h
index cec5918..91a9aef 100644
--- a/libeasaccount/src/eas-account-list.h
+++ b/libeasaccount/src/eas-account-list.h
@@ -26,7 +26,12 @@
 #define __EAS_ACCOUNT_LIST__
 
 
-#include <libedataserver/libedataserver.h>
+#include <libedataserver/eds-version.h>
+#if EDS_CHECK_VERSION(3,6,0)
+# include <libedataserver/libedataserver.h>
+#else
+# include <libedataserver/e-list.h>
+#endif
 
 #include "eas-account.h"
 #include <gconf/gconf-client.h>