[evolution-data-server] Bug 794628 - Don't preload timezones on libical 3.0.2+ ][

[Milan Crha <mcrha src gnome org>]

commit c8fbcaa5f0b46938c2fb348a7f606048acaee82c
Author: Milan Crha <mcrha redhat com>
Date:   Tue Mar 27 17:23:12 2018 +0200

    Bug 794628 - Don't preload timezones on libical 3.0.2+ ][
    
    Correct build issue when using libical 2.0 or older.

 src/calendar/libedata-cal/e-data-cal-factory.c     |    7 +++++++
 .../libedata-cal/e-subprocess-cal-factory.c        |    7 +++++++
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/src/calendar/libedata-cal/e-data-cal-factory.c b/src/calendar/libedata-cal/e-data-cal-factory.c
index c90db3e..dcb05be 100644
--- a/src/calendar/libedata-cal/e-data-cal-factory.c
+++ b/src/calendar/libedata-cal/e-data-cal-factory.c
@@ -55,12 +55,19 @@
  * https://github.com/libical/libical/pull/335 and the implementation in
  * https://github.com/libical/libical/blob/master/src/libical/icalversion.h.cmake.
  */
+#if defined(ICAL_CHECK_VERSION) && defined(ICAL_MAJOR_VERSION) && defined(ICAL_MINOR_VERSION) && 
defined(ICAL_MICRO_VERSION)
 #undef ICAL_CHECK_VERSION
 #define ICAL_CHECK_VERSION(major,minor,micro)                          \
     (ICAL_MAJOR_VERSION > (major) ||                                   \
     (ICAL_MAJOR_VERSION == (major) && ICAL_MINOR_VERSION > (minor)) || \
     (ICAL_MAJOR_VERSION == (major) && ICAL_MINOR_VERSION == (minor) && \
     ICAL_MICRO_VERSION >= (micro)))
+#else
+#if defined(ICAL_CHECK_VERSION)
+#undef ICAL_CHECK_VERSION
+#endif
+#define ICAL_CHECK_VERSION(major,minor,micro) (0)
+#endif
 
 #define d(x)
 
diff --git a/src/calendar/libedata-cal/e-subprocess-cal-factory.c 
b/src/calendar/libedata-cal/e-subprocess-cal-factory.c
index 92728de..7547a30 100644
--- a/src/calendar/libedata-cal/e-subprocess-cal-factory.c
+++ b/src/calendar/libedata-cal/e-subprocess-cal-factory.c
@@ -44,12 +44,19 @@
  * https://github.com/libical/libical/pull/335 and the implementation in
  * https://github.com/libical/libical/blob/master/src/libical/icalversion.h.cmake.
  */
+#if defined(ICAL_CHECK_VERSION) && defined(ICAL_MAJOR_VERSION) && defined(ICAL_MINOR_VERSION) && 
defined(ICAL_MICRO_VERSION)
 #undef ICAL_CHECK_VERSION
 #define ICAL_CHECK_VERSION(major,minor,micro)                          \
     (ICAL_MAJOR_VERSION > (major) ||                                   \
     (ICAL_MAJOR_VERSION == (major) && ICAL_MINOR_VERSION > (minor)) || \
     (ICAL_MAJOR_VERSION == (major) && ICAL_MINOR_VERSION == (minor) && \
     ICAL_MICRO_VERSION >= (micro)))
+#else
+#if defined(ICAL_CHECK_VERSION)
+#undef ICAL_CHECK_VERSION
+#endif
+#define ICAL_CHECK_VERSION(major,minor,micro) (0)
+#endif
 
 /* Forward Declarations */
 static void    e_subprocess_cal_factory_initable_init