evolution-data-server r10036 - in trunk: . calendar calendar/backends/google calendar/libecal calendar/libedata-cal calendar/tests/ecal

[msuman svn gnome org]

Author: msuman
Date: Thu Feb  5 06:34:28 2009
New Revision: 10036
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=10036&view=rev

Log:
Fix for bug #569459 (Include <libical/ical*.h> and not just <ical*.h>)

Modified:
   trunk/ChangeLog
   trunk/calendar/ChangeLog
   trunk/calendar/backends/google/e-cal-backend-google-utils.c
   trunk/calendar/libecal/e-cal-check-timezones.c
   trunk/calendar/libecal/e-cal-check-timezones.h
   trunk/calendar/libecal/e-cal-component.h
   trunk/calendar/libecal/e-cal-time-util.h
   trunk/calendar/libecal/e-cal-util.h
   trunk/calendar/libecal/libecal.pc.in
   trunk/calendar/libedata-cal/e-data-cal-factory.h
   trunk/calendar/libedata-cal/e-data-cal.c
   trunk/calendar/tests/ecal/test-ecal.c
   trunk/configure.in

Modified: trunk/calendar/backends/google/e-cal-backend-google-utils.c
==============================================================================
--- trunk/calendar/backends/google/e-cal-backend-google-utils.c	(original)
+++ trunk/calendar/backends/google/e-cal-backend-google-utils.c	Thu Feb  5 06:34:28 2009
@@ -50,7 +50,7 @@
 #include <libecal/e-cal-time-util.h>
 
 
-#include <icaltimezone.h>
+#include <libical/ical.h>
 #include <libsoup/soup-misc.h>
 
 #include "e-cal-backend-google.h"

Modified: trunk/calendar/libecal/e-cal-check-timezones.c
==============================================================================
--- trunk/calendar/libecal/e-cal-check-timezones.c	(original)
+++ trunk/calendar/libecal/e-cal-check-timezones.c	Thu Feb  5 06:34:28 2009
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <ical.h>
+#include <libical/ical.h>
 
 #include "e-cal-check-timezones.h"
 #include <libecal/e-cal.h>

Modified: trunk/calendar/libecal/e-cal-check-timezones.h
==============================================================================
--- trunk/calendar/libecal/e-cal-check-timezones.h	(original)
+++ trunk/calendar/libecal/e-cal-check-timezones.h	Thu Feb  5 06:34:28 2009
@@ -20,7 +20,7 @@
 #ifndef E_CAL_CHECK_TIMEZONES_H
 #define E_CAL_CHECK_TIMEZONES_H
 
-#include <ical.h>
+#include <libical/ical.h>
 #include <glib.h>
 
 G_BEGIN_DECLS

Modified: trunk/calendar/libecal/e-cal-component.h
==============================================================================
--- trunk/calendar/libecal/e-cal-component.h	(original)
+++ trunk/calendar/libecal/e-cal-component.h	Thu Feb  5 06:34:28 2009
@@ -23,7 +23,7 @@
 
 #include <time.h>
 #include <glib-object.h>
-#include <ical.h>
+#include <libical/ical.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/calendar/libecal/e-cal-time-util.h
==============================================================================
--- trunk/calendar/libecal/e-cal-time-util.h	(original)
+++ trunk/calendar/libecal/e-cal-time-util.h	Thu Feb  5 06:34:28 2009
@@ -13,7 +13,7 @@
 
 
 #include <time.h>
-#include <ical.h>
+#include <libical/ical.h>
 #include <glib.h>
 
 G_BEGIN_DECLS

Modified: trunk/calendar/libecal/e-cal-util.h
==============================================================================
--- trunk/calendar/libecal/e-cal-util.h	(original)
+++ trunk/calendar/libecal/e-cal-util.h	Thu Feb  5 06:34:28 2009
@@ -21,7 +21,7 @@
 #ifndef E_CAL_UTIL_H
 #define E_CAL_UTIL_H
 
-#include <ical.h>
+#include <libical/ical.h>
 #include <time.h>
 #include <glib.h>
 #include <libecal/e-cal-component.h>

Modified: trunk/calendar/libecal/libecal.pc.in
==============================================================================
--- trunk/calendar/libecal/libecal.pc.in	(original)
+++ trunk/calendar/libecal/libecal.pc.in	Thu Feb  5 06:34:28 2009
@@ -15,4 +15,4 @@
 Version: @VERSION@
 Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libical >= @LIBICAL_REQUIRED@ libedataserver-1.2
 Libs: -L${libdir} -lecal-1.2
-Cflags: -I${privincludedir}
+Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@

Modified: trunk/calendar/libedata-cal/e-data-cal-factory.h
==============================================================================
--- trunk/calendar/libedata-cal/e-data-cal-factory.h	(original)
+++ trunk/calendar/libedata-cal/e-data-cal-factory.h	Thu Feb  5 06:34:28 2009
@@ -22,7 +22,7 @@
 #define E_DATA_CAL_FACTORY_H
 
 #include <bonobo/bonobo-object.h>
-#include <ical.h>
+#include <libical/ical.h>
 #include <libedata-cal/Evolution-DataServer-Calendar.h>
 #include <libedata-cal/e-cal-backend-loader-factory.h>
 

Modified: trunk/calendar/libedata-cal/e-data-cal.c
==============================================================================
--- trunk/calendar/libedata-cal/e-data-cal.c	(original)
+++ trunk/calendar/libedata-cal/e-data-cal.c	Thu Feb  5 06:34:28 2009
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <ical.h>
+#include <libical/ical.h>
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-exception.h>
 #include <libedata-cal/e-cal-backend.h>

Modified: trunk/calendar/tests/ecal/test-ecal.c
==============================================================================
--- trunk/calendar/tests/ecal/test-ecal.c	(original)
+++ trunk/calendar/tests/ecal/test-ecal.c	Thu Feb  5 06:34:28 2009
@@ -27,7 +27,7 @@
 #include <libecal/e-cal.h>
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal-time-util.h>
-#include <ical.h>
+#include <libical/ical.h>
 
 /* start_testing_scaffold */
 #define mu_assert(message, test) do { if (!(test)) return message; else { tests_passed++; return NULL;}} while (0)

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Feb  5 06:34:28 2009
@@ -1496,8 +1496,8 @@
 dnl  EVO_SET_COMPILE_FLAGS(VAR-PREFIX, DEPS, EXTRA-CFLAGS, EXTRA-LIBS)
 AC_DEFUN([EVO_SET_COMPILE_FLAGS], [
 	PKG_CHECK_MODULES([$1], [$2])
-	$1_CFLAGS="[$]$1_CFLAGS \$(WERROR) $3"
-	$1_LIBS="[$]$1_LIBS $4"
+	$1_CFLAGS="[$]$1_CFLAGS $3 "
+	$1_LIBS="[$]$1_LIBS $4 "
 ])
 
 dnl ****************************************
@@ -1536,7 +1536,19 @@
 if test "x${enable_calendar}" = "xyes"; then
 	EVOLUTION_CALENDAR_DEPS="libical >= libical_minimum_version libxml-2.0 libbonobo-2.0 gio-2.0 gobject-2.0 gthread-2.0 gconf-2.0"
 
-	EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
+dnl *****
+dnl libical.pc from libical-0.43 has a bug in it's CFlags. 
+dnl It wants apps to include <libical/ical*.h> but it's CFlags make it difficult
+dnl to differentiate between <libical/ical.h> and <ical.h>
+dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from 
+dnl libical is fixed, we have to work-around the buggy CFlags.
+dnl *****
+LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` "
+LIBICAL_EXTRA_LIBS=""
+AC_SUBST(LIBICAL_EXTRA_CFLAGS)
+AC_SUBST(LIBICAL_EXTRA_LIBS)
+
+	EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS, $LIBICAL_EXTRA_CFLAGS, $LIBICAL_EXTRA_LIBS)
 	AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
 	AC_SUBST(EVOLUTION_CALENDAR_LIBS)
 fi