libical: moved support code into core SyncEvolution

The CalDAVSource also calls libical and needs the same compatibility
layer as the EDS backend.

src/backends/evolution/EvolutionCalendarSource.cpp

@@ -26,7 +26,7 @@ using namespace std;
 #ifdef ENABLE_ECAL
 
 // include first, it sets HANDLE_LIBICAL_MEMORY for us
-#include "libical/icalstrdup.h"
+#include <syncevo/icalstrdup.h>
 
 #include <syncevo/SyncContext.h>
 #include <syncevo/SmartPtr.h>

src/backends/evolution/Makefile.am

@@ -22,8 +22,6 @@ SYNCECAL_SOURCES = \
 
 if ENABLE_ECAL
 SYNCECAL_SOURCES += \
-	libical/icalstrdup.c \
-	libical/icalstrdup.h \
 	e-cal-check-timezones.c \
 	e-cal-check-timezones.h
 endif

src/backends/evolution/configure-sub.in

@@ -72,6 +72,7 @@ else
 fi
 
 AM_CONDITIONAL([ENABLE_ECAL], [test "$enable_ecal" == "yes"])
+AM_CONDITIONAL([ENABLE_ICAL], [test "$enable_ecal" = "yes"])
 if test "$enable_ecal" = "yes"; then
         test "x${ECALFOUND}" == "xyes" || AC_MSG_ERROR([--enable-ecal requires pkg-config information for libecal, which was not found"])
         AC_DEFINE(ENABLE_ECAL, 1, [libecal available])

src/backends/evolution/e-cal-check-timezones.c

@@ -29,7 +29,7 @@
 # define ical_strdup(_x) (_x)
 #else
 /* use icalstrdup.h to get runtime detection of memory fix patch */
-# include "libical/icalstrdup.h"
+# include <syncevo/icalstrdup.h>
 #endif
 
 #include "e-cal-check-timezones.h"

src/syncevo/Makefile.am

@@ -115,6 +115,13 @@ SYNCEVOLUTION_SOURCES  = \
 	TrackingSyncSource.h \
 	TrackingSyncSource.cpp
 
+if ENABLE_ICAL
+SYNCEVOLUTION_SOURCES += \
+	icalstrdup.c \
+	icalstrdup.h
+endif
+
+
 libsyncevolution_includedir= $(includedir)/syncevo
 libsyncevolution_include_HEADERS = \
 	declarations.h \
@@ -136,8 +143,11 @@ libsyncevolution_include_HEADERS = \
 								  Logging.h \
 								  SyncML.h \
 								  eds_abi_wrapper.h \
+								  icalstrdup.h \
 								  SmartPtr.h \
 								  ConfigNode.h 
+
+
 if ENABLE_OBEX 
 SYNCEVOLUTION_SOURCES += ObexTransportAgent.h ObexTransportAgent.cpp
 SYNCEVOLUTION_LDADD += $(LIBOPENOBEX_LIBS)

src/syncevo/icalstrdup.c

@@ -17,7 +17,7 @@
  * 02110-1301  USA
  */
 
-#include "libical/icalstrdup.h"
+#include "icalstrdup.h"
 #include <syncevo/eds_abi_wrapper.h>
 
 #if !defined(LIBICAL_MEMFIXES) || defined(EVOLUTION_COMPATIBILITY)