[telepathy-mission-control/master] configure: add --enable-gnome-keyring support

[Jonny Lamb]

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 configure.ac     |   28 ++++++++++++++++++++++++++++
 src/Makefile.am  |    8 ++++++++
 test/Makefile.am |    4 ++++
 3 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index ca087f4..b81f60c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -263,6 +263,27 @@ then
   AC_DEFINE([ENABLE_PLUGINS], [1], [Define if plugins should be enabled])
 fi
 
+keyring_enabled="no"
+AC_MSG_CHECKING(whether to build with gnome-keyring support)
+AC_ARG_ENABLE(gnome-keyring,
+        [ --enable-gnome-keyring    build with gnome-keyring support. default=no],
+        [
+                AC_MSG_RESULT(${enableval})
+                keyring_enabled="${enableval}"
+        ],
+        [
+                AC_MSG_RESULT(no)
+                keyring_enabled="no"
+        ]
+)
+AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test x$keyring_enabled = xyes])
+if test "x$keyring_enabled" = xyes
+then
+  AC_DEFINE([ENABLE_GNOME_KEYRING], [1], [Define whether gnome-keyring support is enabled])
+else
+  AC_DEFINE([ENABLE_GNOME_KEYRING], [0], [Define whether gnome-keyring support is enabled])
+fi
+
 PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.51, dbus-glib-1 >= 0.51], have_dbus=yes, have_dbus=no)
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
@@ -289,6 +310,13 @@ then
   AC_SUBST(GMODULE_CFLAGS)
 fi
 
+if test "x$keyring_enabled" = xyes
+then
+  PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1)
+  AC_SUBST(GNOME_KEYRING_LIBS)
+  AC_SUBST(GNOME_KEYRING_CFLAGS)
+fi
+
 dnl docs/Makefile.am needs to know whether it's an out of tree build
 dnl (srcdir != builddir)
 AM_CONDITIONAL([OUT_OF_TREE_BUILD], [test "z$ac_srcdir" != z.])
diff --git a/src/Makefile.am b/src/Makefile.am
index b4c9db1..7726432 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,10 @@ INCLUDES = \
 	   -DDBUS_API_SUBJECT_TO_CHANGE \
 	   -DMC_DISABLE_DEPRECATED -I$(top_srcdir)
 
+if ENABLE_GNOME_KEYRING
+INCLUDES += $(GNOME_KEYRING_CFLAGS)
+endif
+
 mc_headers = \
 	mcd-account.h \
 	mcd-account-compat.h \
@@ -72,6 +76,10 @@ libmcd_convenience_la_LIBADD = \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS)
 
+if ENABLE_GNOME_KEYRING
+libmcd_convenience_la_LIBADD += $(GNOME_KEYRING_LIBS)
+endif
+
 noinst_LTLIBRARIES = libmcd-convenience.la
 
 if ENABLE_PLUGINS
diff --git a/test/Makefile.am b/test/Makefile.am
index e80766e..d57d711 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -8,6 +8,10 @@ INCLUDES = \
 	-DMC_DISABLE_DEPRECATED \
 	-DLIBDIR="@libdir@" -DLIBVERSION="0"
 
+if ENABLE_GNOME_KEYRING
+INCLUDES += $(GNOME_KEYRING_CFLAGS)
+endif
+
 if HAVE_TESTS
 
 SUBDIRS = twisted
-- 
1.5.6.5