[folks] Expose the details of which backends are enabled to libfolks.
- From: Travis Reitter <treitter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] Expose the details of which backends are enabled to libfolks.
- Date: Fri, 28 Oct 2011 16:17:27 +0000 (UTC)
commit 1432a353880ad1d1784b20f5edb90fc6179558cd
Author: Travis Reitter <travis reitter collabora co uk>
Date: Wed Oct 26 17:28:56 2011 -0700
Expose the details of which backends are enabled to libfolks.
Helps: bgo#662274 - Failed to link personas: Can't link personas with
no primary store.
configure.ac | 20 +++++++++++++++++++-
folks/build-conf.vapi | 9 +++++++++
2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 22141fa..0088d2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,12 +77,27 @@ AC_ARG_ENABLE(tracker-backend,
AM_CONDITIONAL([ENABLE_TRACKER], [test "x$enable_tracker_backend" = "xyes"])
+if test "x$enable_tracker_backend" = "xyes"; then
+ AC_DEFINE(HAVE_TRACKER, [1],
+ [Define as 1 if you have the Tracker backend])
+else
+ AC_DEFINE(HAVE_TRACKER, [0],
+ [Define as 1 if you have the Tracker backend])
+fi
+
AC_ARG_ENABLE(eds-backend,
AC_HELP_STRING([--enable-eds-backend],
[ build the E-D-S backend]),
enable_eds_backend=$enableval,
enable_eds_backend=yes )
+if test "x$enable_eds_backend" = "xyes"; then
+ AC_DEFINE(HAVE_EDS, [1], [Define as 1 if you have the eds backend])
+else
+ AC_DEFINE(HAVE_EDS, [0], [Define as 1 if you have the eds backend])
+fi
+
+
AM_CONDITIONAL([ENABLE_EDS], [test "x$enable_eds_backend" = "xyes"])
# Automatically check the dependencies for the libsocialweb backend
@@ -93,6 +108,9 @@ AC_ARG_ENABLE(libsocialweb-backend,
enable_libsocialweb_backend=$enableval,
enable_libsocialweb_backend=auto )
+# this may be overwritten farther down
+AC_DEFINE(HAVE_LIBSOCIALWEB, [0],
+ [Define as 1 if you have the libsocialweb backend])
if test "x$enable_libsocialweb_backend" != "xno"; then
PKG_CHECK_MODULES([SW_CLIENT], [libsocialweb-client >= $SW_CLIENT_REQUIRED],
have_libsocialweb_backend="yes", have_libsocialweb_backend="no")
@@ -107,7 +125,7 @@ if test "x$enable_libsocialweb_backend" != "xno"; then
fi
if test "x$have_libsocialweb_backend" = "xyes"; then
- AC_DEFINE(HAVE_LIBSOCIALWEB, [],
+ AC_DEFINE(HAVE_LIBSOCIALWEB, [1],
[Define if you have the libsocialweb backend])
fi
else
diff --git a/folks/build-conf.vapi b/folks/build-conf.vapi
index 82c36c3..e9ceafc 100644
--- a/folks/build-conf.vapi
+++ b/folks/build-conf.vapi
@@ -44,4 +44,13 @@ public class Folks.BuildConf
[CCode (cname = "LOCALE_DIR")]
public static const string LOCALE_DIR;
+
+ [CCode (cname = "HAVE_EDS")]
+ public static bool HAVE_EDS;
+
+ [CCode (cname = "HAVE_LIBSOCIALWEB")]
+ public static bool HAVE_LIBSOCIALWEB;
+
+ [CCode (cname = "HAVE_TRACKER")]
+ public static bool HAVE_TRACKER;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]