[evolution-exchange] Fixes #605111 - evolution-exchange requires evolution-mail, evolution-shell.
- From: Jedy Jedy Wang <jedywang src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-exchange] Fixes #605111 - evolution-exchange requires evolution-mail, evolution-shell.
- Date: Fri, 8 Jan 2010 02:44:49 +0000 (UTC)
commit 1f7c640669f7e06e6f8cfe29dc04a454b38e3fb5
Author: Wang Xin <jedy wang sun com>
Date: Fri Jan 8 10:42:56 2010 +0800
Fixes #605111 - evolution-exchange requires evolution-mail, evolution-shell.
configure.ac | 14 ++++++++++++++
eplugin/Makefile.am | 7 +++++--
2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 684d241..76318d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,6 +218,20 @@ PKG_CHECK_MODULES(EVOLUTION_PLUGIN, evolution-plugin >= evo_minimum_version)
AC_SUBST(EVOLUTION_PLUGIN_CFLAGS)
AC_SUBST(EVOLUTION_PLUGIN_LIBS)
+dnl ***************************
+dnl Check for evolution mail
+dnl ***************************
+PKG_CHECK_MODULES(EVOLUTION_MAIL, evolution-mail >= evo_minimum_version)
+AC_SUBST(EVOLUTION_MAIL_CFLAGS)
+AC_SUBST(EVOLUTION_MAIL_LIBS)
+
+dnl ***************************
+dnl Check for evolution shell
+dnl ***************************
+PKG_CHECK_MODULES(EVOLUTION_SHELL, evolution-shell >= evo_minimum_version)
+AC_SUBST(EVOLUTION_SHELL_CFLAGS)
+AC_SUBST(EVOLUTION_SHELL_LIBS)
+
dnl *********************
dnl Pilot license support
dnl *********************
diff --git a/eplugin/Makefile.am b/eplugin/Makefile.am
index f658f2a..94005b2 100644
--- a/eplugin/Makefile.am
+++ b/eplugin/Makefile.am
@@ -26,7 +26,9 @@ liborg_gnome_exchange_operations_la_CPPFLAGS = \
-I$(top_builddir)/server/lib \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(EVOLUTION_PLUGIN_CFLAGS) \
- $(CAMEL_EXCHANGE_CFLAGS)
+ $(EVOLUTION_SHELL_CFLAGS) \
+ $(EVOLUTION_MAIL_CFLAGS)
+
liborg_gnome_exchange_operations_la_SOURCES = \
exchange-operations.c \
@@ -59,7 +61,8 @@ liborg_gnome_exchange_operations_la_SOURCES = \
liborg_gnome_exchange_operations_la_LIBADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(EVOLUTION_PLUGIN_LIBS) \
- $(CAMEL_EXCHANGE_LIBS) \
+ $(EVOLUTION_SHELL_LIBS) \
+ $(EVOLUTION_MAIL_LIBS) \
$(top_builddir)/server/storage/libexchange-storage.la
liborg_gnome_exchange_operations_la_LDFLAGS = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]