Author: jjohnny
Date: Fri Feb 15 11:30:08 2008
New Revision: 35016
URL: http://svn.gnome.org/viewvc/evolution?rev=35016&view=rev
Log:
Removed hardcoded ldif dir path. Pick it up form libmapi.pc
Modified:
branches/EXCHANGE_MAPI_BRANCH/ChangeLog
branches/EXCHANGE_MAPI_BRANCH/configure.in
branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi/ChangeLog
branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi/Makefile.am
branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi/exchange-mapi-account-setup.c
Modified: branches/EXCHANGE_MAPI_BRANCH/configure.in
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/configure.in (original)
+++ branches/EXCHANGE_MAPI_BRANCH/configure.in Fri Feb 15 11:30:08 2008
@@ -1180,6 +1180,8 @@
libmapi="libmapi"
msg_exchange_mapi=yes
EXCHANGE_MAPI_PLUGIN="exchange-mapi"
+ libmapi_ldif_dir=`pkg-config --variable=datadir libmapi`/setup
+ AC_SUBST(libmapi_ldif_dir)
else
libmapi==""
fi
Modified: branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi/Makefile.am
(original)
+++ branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi/Makefile.am Fri Feb
15 11:30:08 2008
@@ -7,6 +7,7 @@
$(CAMEL_EXCHANGE_CFLAGS) \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DCONNECTOR_GLADEDIR=\""$(gladedir)"\" \
+ -DLIBAMPI_LDIF_DIR=\""$(libmapi_ldif_dir)"\" \
$(LIBMAPI_CFLAGS)
Modified:
branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi/exchange-mapi-account-setup.c
==============================================================================
---
branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi/exchange-mapi-account-setup.c
(original)
+++
branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi/exchange-mapi-account-setup.c
Fri Feb 15 11:30:08 2008
@@ -146,8 +146,7 @@
profpath = g_build_filename (g_getenv("HOME"), DEFAULT_PROF_PATH, NULL);
if (!g_file_test (profpath, G_FILE_TEST_EXISTS)) {
/* Create MAPI Profile */
- //FIXME: Get the PATH from Makefile
- if (CreateProfileStore (profpath,
"/usr/local/samba/share/setup") != MAPI_E_SUCCESS) {
+ if (CreateProfileStore (profpath, LIBAMPI_LDIF_DIR) !=
MAPI_E_SUCCESS) {
g_warning ("Profile Database creation failed\n");
g_free (profpath);
return FALSE;
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
