From bdae80d25488bcb2dbb7488723764f3cd27403d6 Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Thu, 5 Feb 2009 06:34:28 +0000 Subject: [PATCH] Fix for bug #569459 (Include and not just ) svn path=/trunk/; revision=10036 --- ChangeLog | 5 +++++ calendar/ChangeLog | 20 +++++++++++++++++++- .../backends/google/e-cal-backend-google-utils.c | 2 +- calendar/libecal/e-cal-check-timezones.c | 2 +- calendar/libecal/e-cal-check-timezones.h | 2 +- calendar/libecal/e-cal-component.h | 2 +- calendar/libecal/e-cal-time-util.h | 2 +- calendar/libecal/e-cal-util.h | 2 +- calendar/libecal/libecal.pc.in | 2 +- calendar/libedata-cal/e-data-cal-factory.h | 2 +- calendar/libedata-cal/e-data-cal.c | 2 +- calendar/tests/ecal/test-ecal.c | 2 +- configure.in | 18 +++++++++++++++--- 13 files changed, 49 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index dec48fb..fa0a5c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-02-05 Suman Manjunath + + * configure.in: Expose the right CFLAGS for libical headers. We want + to include (as suggested). + 2009-02-03 Tor Lillqvist * configure.in: Use the more traditional and reliable diff --git a/calendar/ChangeLog b/calendar/ChangeLog index f6b9bed..7ec2502 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,21 @@ +2009-02-05 Suman Manjunath + + ** Fix for bug #569459 + + * backends/google/e-cal-backend-google-utils.c: + * libecal/e-cal-check-timezones.c: + * libecal/e-cal-check-timezones.h: + * libecal/e-cal-component.h: + * libecal/e-cal-time-util.h: + * libecal/e-cal-util.h: + * libecal/libecal.pc.in: + * libedata-cal/e-data-cal-factory.h: + * libedata-cal/e-data-cal.c: + * tests/ecal/test-ecal.c: + Revert back to including . This is what is + suggested by the upstream folks. Since libical.pc (in 0.43) + has a problem with its CFlags, make necessary adjustments. + 2009-02-02 James Bottomley ** Fix for bug #566809 @@ -25,7 +43,7 @@ * calendar/libecal/e-cal-util.h: * calendar/libedata-cal/e-data-cal-factory.h: * calendar/libedata-cal/e-data-cal.c: - * calendar/tests/ecal/test-ecal.c: Chnage include path + * calendar/tests/ecal/test-ecal.c: Change include path for ical.h. removed libical/ from #include. 2009-01-29 Ross Burton diff --git a/calendar/backends/google/e-cal-backend-google-utils.c b/calendar/backends/google/e-cal-backend-google-utils.c index ff4a751..acddb71 100644 --- a/calendar/backends/google/e-cal-backend-google-utils.c +++ b/calendar/backends/google/e-cal-backend-google-utils.c @@ -50,7 +50,7 @@ #include -#include +#include #include #include "e-cal-backend-google.h" diff --git a/calendar/libecal/e-cal-check-timezones.c b/calendar/libecal/e-cal-check-timezones.c index 49e45e7..bd94b0f 100644 --- a/calendar/libecal/e-cal-check-timezones.c +++ b/calendar/libecal/e-cal-check-timezones.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include "e-cal-check-timezones.h" #include diff --git a/calendar/libecal/e-cal-check-timezones.h b/calendar/libecal/e-cal-check-timezones.h index 3fe256d..a19f644 100644 --- a/calendar/libecal/e-cal-check-timezones.h +++ b/calendar/libecal/e-cal-check-timezones.h @@ -20,7 +20,7 @@ #ifndef E_CAL_CHECK_TIMEZONES_H #define E_CAL_CHECK_TIMEZONES_H -#include +#include #include G_BEGIN_DECLS diff --git a/calendar/libecal/e-cal-component.h b/calendar/libecal/e-cal-component.h index 7d8ae80..52a8fdb 100644 --- a/calendar/libecal/e-cal-component.h +++ b/calendar/libecal/e-cal-component.h @@ -23,7 +23,7 @@ #include #include -#include +#include G_BEGIN_DECLS diff --git a/calendar/libecal/e-cal-time-util.h b/calendar/libecal/e-cal-time-util.h index 9ef2cd4..31691e7 100644 --- a/calendar/libecal/e-cal-time-util.h +++ b/calendar/libecal/e-cal-time-util.h @@ -13,7 +13,7 @@ #include -#include +#include #include G_BEGIN_DECLS diff --git a/calendar/libecal/e-cal-util.h b/calendar/libecal/e-cal-util.h index 301a542..a369b59 100644 --- a/calendar/libecal/e-cal-util.h +++ b/calendar/libecal/e-cal-util.h @@ -21,7 +21,7 @@ #ifndef E_CAL_UTIL_H #define E_CAL_UTIL_H -#include +#include #include #include #include diff --git a/calendar/libecal/libecal.pc.in b/calendar/libecal/libecal.pc.in index 7d9084e..8e9bc8a 100644 --- a/calendar/libecal/libecal.pc.in +++ b/calendar/libecal/libecal.pc.in @@ -15,4 +15,4 @@ Description: Client library for evolution calendars 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@ diff --git a/calendar/libedata-cal/e-data-cal-factory.h b/calendar/libedata-cal/e-data-cal-factory.h index dcae07e..a8eae5d 100644 --- a/calendar/libedata-cal/e-data-cal-factory.h +++ b/calendar/libedata-cal/e-data-cal-factory.h @@ -22,7 +22,7 @@ #define E_DATA_CAL_FACTORY_H #include -#include +#include #include #include diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c index 8171090..8795762 100644 --- a/calendar/libedata-cal/e-data-cal.c +++ b/calendar/libedata-cal/e-data-cal.c @@ -23,7 +23,7 @@ #include #endif -#include +#include #include #include #include diff --git a/calendar/tests/ecal/test-ecal.c b/calendar/tests/ecal/test-ecal.c index db2588c..38e3afd 100644 --- a/calendar/tests/ecal/test-ecal.c +++ b/calendar/tests/ecal/test-ecal.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include /* start_testing_scaffold */ #define mu_assert(message, test) do { if (!(test)) return message; else { tests_passed++; return NULL;}} while (0) diff --git a/configure.in b/configure.in index 79d7d98..d4e74ef 100644 --- a/configure.in +++ b/configure.in @@ -1496,8 +1496,8 @@ dnl Utility macro to set compiler flags for a specific lib. 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 @@ dnl --- evolution-calendar flags 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 but it's CFlags make it difficult +dnl to differentiate between and +dnl We have fixed all our instances to use . 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 -- 2.7.4