[evolution-scalix] Changes required to build against Evolution 2.26.

[Pat Suwalski <psuwalski src gnome org>]

commit df34ee0bb45c737605101adbca41cffdc078904d
Author: Pat Suwalski <pat suwalski net>
Date:   Sun May 3 00:10:01 2009 -0400

    Changes required to build against Evolution 2.26.
---
 addressbook/Makefile.am         |    3 ++-
 calendar/e-cal-backend-scalix.c |    4 ++--
 calendar/fb-utils.c             |    4 ++--
 configure.in                    |    9 +++++++++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 928b8ad..1a111f9 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -4,7 +4,8 @@ INCLUDES =						\
 	$(CAMEL_CFLAGS)					\
 	$(GNOME_VFS_CFLAGS)				\
 	$(DATABOOK_CFLAGS)                 		\
-	$(LIBXML_CFLAGS)				
+	$(LIBXML_CFLAGS)				\
+	$(EDS_UI_CFLAGS)				
 
 backend_LTLIBRARIES = libebookbackendscalix.la
 
diff --git a/calendar/e-cal-backend-scalix.c b/calendar/e-cal-backend-scalix.c
index bb39a04..2111a61 100644
--- a/calendar/e-cal-backend-scalix.c
+++ b/calendar/e-cal-backend-scalix.c
@@ -1562,7 +1562,7 @@ add_timezone (ECalBackendSync * backend, EDataCal * cal, const char *tzobj)
     ECalBackendScalixPrivate *priv;
     ECalBackendSyncStatus res;
     icalcomponent *tz_comp;
-    char *tzid = NULL;
+    const char *tzid = NULL;
     char *zstr = NULL;
     icaltimezone *zone;
 
@@ -1619,7 +1619,7 @@ extract_timezones (gpointer data, gpointer user_data)
 {
     GHashTable *timezones;
     icaltimezone *zone = NULL;
-    char *tzid = NULL;
+    const char *tzid = NULL;
     char *zstr = NULL;
 
     timezones = (GHashTable *) user_data;
diff --git a/calendar/fb-utils.c b/calendar/fb-utils.c
index 21803c6..c77c983 100644
--- a/calendar/fb-utils.c
+++ b/calendar/fb-utils.c
@@ -259,13 +259,13 @@ merge_freebusy_data (icalcomponent * vfb)
         else
             param = NULL;       /* FIXME (carsten) */
 
-        temp = icaltime_as_ical_string (fb_entry.start);
+        temp = (char *)icaltime_as_ical_string (fb_entry.start);
         period_string = g_string_new (temp);
 #ifdef HANDLE_LIBICAL_MEMORY
         g_free (temp);
 #endif
         period_string = g_string_append (period_string, "/");
-        temp = icaltime_as_ical_string (fb_entry.end);
+        temp = (char *)icaltime_as_ical_string (fb_entry.end);
         period_string = g_string_append (period_string, temp);
 #ifdef HANDLE_LIBICAL_MEMORY
         g_free (temp);
diff --git a/configure.in b/configure.in
index a9aa865..4583e6a 100644
--- a/configure.in
+++ b/configure.in
@@ -123,6 +123,15 @@ case "$version" in
 	EDS_API_VERSION=1.2
 	CFLAGS="$CFLAGS -DHANDLE_LIBICAL_MEMORY"
 	;;
+	
+	2.26)
+	EVOLUTION_API_VERSION=2.26
+	EAPI_MAJOR_VERSION=2
+	EAPI_MINOR_VERSION=26
+	CAMEL_API_VERSION=1.2
+	EDS_API_VERSION=1.2
+	CFLAGS="$CFLAGS -DHANDLE_LIBICAL_MEMORY"
+	;;
 
 esac