[telepathy-mission-control/master] fd.o #22332: make GConf only a weak dependency

[Simon McVittie]

* Make mc-tool not depend on GConf (there's no reason for it to do so)
* Make GConf optional, and only build mc-account-convert if we do have it
---
 configure.ac     |    4 +++-
 util/Makefile.am |   17 ++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9392f1a..81a829c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -272,7 +272,9 @@ AC_SUBST(TELEPATHY_LIBS)
 AC_SUBST(TELEPATHY_CFLAGS)
 
 GCONF_REQUIRED_VERSION=2.0.0
-PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED_VERSION)
+PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED_VERSION,
+		  [HAVE_GCONF=yes], [HAVE_GCONF=no])
+AM_CONDITIONAL(HAVE_GCONF, [test x$HAVE_GCONF = xyes])
 AC_SUBST(GCONF_CFLAGS)
 AC_SUBST(GCONF_LIBS)
 
diff --git a/util/Makefile.am b/util/Makefile.am
index 5b06690..6e1cb16 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,11 +1,18 @@
-INCLUDES = $(GCONF_CFLAGS) $(TELEPATHY_CFLAGS) -I$(top_srcdir)
+INCLUDES = $(TELEPATHY_CFLAGS) -I$(top_srcdir)
 
-bin_PROGRAMS = mc-account-convert mc-tool mc-wait-for-name
-mc_account_convert_SOURCES = mc-account-convert.c
-mc_account_convert_LDADD = $(GCONF_LIBS) $(TELEPATHY_LIBS) $(top_builddir)/libmcclient/libmcclient.la
+bin_PROGRAMS = mc-tool mc-wait-for-name
 
 mc_tool_SOURCES = mc-tool.c
-mc_tool_LDADD = $(GCONF_LIBS) $(TELEPATHY_LIBS) $(top_builddir)/libmcclient/libmcclient.la
+mc_tool_LDADD = $(TELEPATHY_LIBS) $(top_builddir)/libmcclient/libmcclient.la
 
 mc_wait_for_name_SOURCES = wait-for-name.c
 mc_wait_for_name_LDADD = $(TELEPATHY_LIBS)
+
+if HAVE_GCONF
+
+bin_PROGRAMS += mc-account-convert
+mc_account_convert_CPPFLAGS = $(GCONF_CFLAGS)
+mc_account_convert_SOURCES = mc-account-convert.c
+mc_account_convert_LDADD = $(GCONF_LIBS) $(TELEPATHY_LIBS) $(top_builddir)/libmcclient/libmcclient.la
+
+endif
-- 
1.5.6.5