[evolution-mapi] Adapt to split E-D-S backend directories.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-mapi] Adapt to split E-D-S backend directories.
- Date: Thu, 6 Jan 2011 16:44:29 +0000 (UTC)
commit 0f9486e90681830b0cdd3e596950dacb3dfa2bc0
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Jan 6 10:16:32 2011 -0500
Adapt to split E-D-S backend directories.
configure.ac | 9 ++++++---
src/addressbook/Makefile.am | 2 +-
src/calendar/Makefile.am | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ae57ea7..c152b66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ EDS_PACKAGE=1.2
dnl *******************
dnl Required Packages
dnl *******************
-m4_define([eds_minimum_version], [2.31.6])
+m4_define([eds_minimum_version], [2.91.5])
m4_define([evo_minimum_version], [2.31.1])
m4_define([libmapi_minimum_version], [0.9])
m4_define([glib_minimum_version], [2.16.1])
@@ -293,8 +293,11 @@ dnl *******************
plugindir=`$PKG_CONFIG --variable=plugindir $EVO_PLUGIN_PACKAGE`
AC_SUBST(plugindir)
-extensiondir=`$PKG_CONFIG --variable=extensiondir evolution-data-server-$EDS_PACKAGE`
-AC_SUBST(extensiondir)
+ebook_backenddir=`$PKG_CONFIG --variable=backenddir libedata-book-1.2`
+AC_SUBST(ebook_backenddir)
+
+ecal_backenddir=`$PKG_CONFIG --variable=backenddir libedata-cal-1.2`
+AC_SUBST(ecal_backenddir)
camel_providerdir=`$PKG_CONFIG --variable=camel_providerdir camel-provider-$EDS_PACKAGE`
AC_SUBST(camel_providerdir)
diff --git a/src/addressbook/Makefile.am b/src/addressbook/Makefile.am
index 6a715f7..e39abb0 100644
--- a/src/addressbook/Makefile.am
+++ b/src/addressbook/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
$(LIBEDATABOOK_CFLAGS) \
$(LIBMAPI_CFLAGS)
-extension_LTLIBRARIES = libebookbackendmapi.la
+ebook_backend_LTLIBRARIES = libebookbackendmapi.la
libebookbackendmapi_la_SOURCES = \
e-book-backend-mapi.c \
diff --git a/src/calendar/Makefile.am b/src/calendar/Makefile.am
index 6140fdb..8a457b6 100644
--- a/src/calendar/Makefile.am
+++ b/src/calendar/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
$(LIBEDATACAL_CFLAGS) \
$(LIBMAPI_CFLAGS)
-extension_LTLIBRARIES = libecalbackendmapi.la
+ecal_backend_LTLIBRARIES = libecalbackendmapi.la
libecalbackendmapi_la_SOURCES = \
e-cal-backend-mapi-factory.c \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]