[evolution-exchange] Bug 665339 - Uses libical but does not link explicitly to it
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-exchange] Bug 665339 - Uses libical but does not link explicitly to it
- Date: Thu, 2 Feb 2012 18:13:30 +0000 (UTC)
commit 80b2f12af4f8ee6d7ba9725b41fb44e1d6665444
Author: Josselin Mouette <joss malsain org>
Date: Thu Feb 2 13:12:57 2012 -0500
Bug 665339 - Uses libical but does not link explicitly to it
calendar/Makefile.am | 2 ++
camel/Makefile.am | 2 ++
configure.ac | 6 ++++++
3 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index 937eb6e..107314c 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -9,6 +9,7 @@ libecalbackendexchange_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"e-cal-backend-exchange\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(EVOLUTION_PLUGIN_CFLAGS) \
+ $(LIBICAL_CFLAGS) \
$(LDAP_CFLAGS)
libecalbackendexchange_la_SOURCES = \
@@ -33,6 +34,7 @@ libecalbackendexchange_la_LIBADD = \
$(top_builddir)/tools/libevolution-exchange-shared.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(EVOLUTION_PLUGIN_LIBS) \
+ $(LIBICAL_LIBS) \
$(LDAP_LIBS) \
$(DNS_LIBS)
diff --git a/camel/Makefile.am b/camel/Makefile.am
index bdeba8e..4fd85a6 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -6,6 +6,7 @@ CAMEL_provider_DATA = libcamelexchange.urls
libcamelexchange_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(EVOLUTION_PLUGIN_CFLAGS) \
+ $(LIBICAL_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/tools \
-I$(top_srcdir)/server/lib \
@@ -50,6 +51,7 @@ libcamelexchange_la_LIBADD = \
$(top_builddir)/tools/libevolution-exchange-shared.la \
$(EVOLUTION_PLUGIN_LIBS) \
$(EVOLUTION_DATA_SERVER_LIBS) \
+ $(LIBICAL_LIBS) \
$(LDAP_LIBS) \
$(SOCKET_LIBS) \
$(DNS_LIBS)
diff --git a/configure.ac b/configure.ac
index 18bc4ba..8277c13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,6 +285,12 @@ case $abt in
esac
AC_DEFINE_UNQUOTED([E2K_APPROX_BUILD_TIME],[$abt],[Used to prevent clock-setting attacks against pilot licenses])
+dnl *****************
+dnl Check for libical
+dnl *****************
+PKG_CHECK_MODULES(LIBICAL, libical >= 0.43)
+AC_SUBST(LIBICAL_CFLAGS)
+AC_SUBST(LIBICAL_LIBS)
AC_DEFINE([HANDLE_LIBICAL_MEMORY],[1],[Define it once memory returned by libical is free'ed properly])
dnl **************
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]