[evolution-data-server/openismus-work-master: 7/10] Make relocatable addressbooks work with direct access.

[Tristan Van Berkom <tvb src gnome org>]

commit 3bf6b7a620d16f5598ad6e8e55c98d43758d6aa9
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Fri Dec 14 20:06:12 2012 +0900

    Make relocatable addressbooks work with direct access.

 addressbook/backends/file/e-book-backend-file.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index e9393ba..ac034b6 100644
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -1677,13 +1677,20 @@ e_book_backend_file_get_direct_book (EBookBackend *backend)
 	ESource *source;
 	gchar *backend_path;
 	gchar *dirname;
+	const gchar *modules_env = NULL;
 	
+	modules_env = g_getenv (EDS_ADDRESS_BOOK_MODULES);
+
 	source = e_backend_get_source (E_BACKEND (backend));
 	registry = e_book_backend_get_registry (backend);
 	dirname = e_book_backend_file_extract_path_from_source (
 		registry, source, GET_PATH_DB_DIR);
 
-	backend_path = g_build_filename (BACKENDDIR, "libebookbackendfile.so", NULL);
+	/* Support in-tree testing / relocated modules */
+	if (modules_env)
+		backend_path = g_build_filename (modules_env, "libebookbackendfile.so", NULL);
+	else
+		backend_path = g_build_filename (BACKENDDIR, "libebookbackendfile.so", NULL);
 	direct = e_data_book_direct_new (backend_path, "EBookBackendFileFactory", dirname);
 
 	g_free (backend_path);