[Telepathy-commits] [telepathy-mission-control/master] Conditional build of libmissioncontrol-client

[Alberto Mardegan]

Allow this legacy library to be taken out of the build
---
 Makefile.am               |   13 +++++++++++--
 configure.ac              |   22 +++++++++++++++++++---
 doc/reference/Makefile.am |    6 ++++--
 test/Makefile.am          |    2 ++
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2375a71..ff39fb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,21 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = m4 tools xml libmcclient libmissioncontrol src doc server test util
+SUBDIRS = m4 tools xml libmcclient src server util
+
+if HAVE_LEGACY
+SUBDIRS += libmissioncontrol
+endif
 
 if HAVE_EXAMPLES
 SUBDIRS += examples
 endif
 
+SUBDIRS += doc test
+
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libmcclient.pc libmissioncontrol.pc mission-control.pc
+pkgconfig_DATA = libmcclient.pc mission-control.pc
+if HAVE_LEGACY
+pkgconfig_DATA += libmissioncontrol.pc
+endif
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
diff --git a/configure.ac b/configure.ac
index 010d2ae..0c4d157 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,9 +193,25 @@ PKG_CHECK_MODULES(TELEPATHY, telepathy-glib >= 0.7.18)
 AC_SUBST(TELEPATHY_LIBS)
 AC_SUBST(TELEPATHY_CFLAGS)
 
-PKG_CHECK_MODULES(LIBTELEPATHY, libtelepathy >= 0.3.0)
-AC_SUBST(LIBTELEPATHY_LIBS)
-AC_SUBST(LIBTELEPATHY_CFLAGS)
+legacy_enabled="yes"
+AC_MSG_CHECKING(whether to build the old libmissioncontrol-client)
+AC_ARG_ENABLE(legacy,
+	[  --enable-legacy         build libmiccioncontrol-client. default=yes],
+	[
+		AC_MSG_RESULT(${enableval})
+		legacy_enabled="${enableval}"
+	],
+	[
+		AC_MSG_RESULT(yes)
+		legacy_enabled="yes"
+	]
+)
+AM_CONDITIONAL(HAVE_LEGACY, [test x$legacy_enabled = xyes])
+if test "x$legacy_enabled" = "xyes"; then
+    PKG_CHECK_MODULES(LIBTELEPATHY, libtelepathy >= 0.3.0)
+    AC_SUBST(LIBTELEPATHY_LIBS)
+    AC_SUBST(LIBTELEPATHY_CFLAGS)
+fi
 
 GCONF_REQUIRED_VERSION=2.0.0
 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED_VERSION)
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index adbcdc1..03ccd67 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -1,2 +1,4 @@
-SUBDIRS = libmcclient libmissioncontrol libmissioncontrol-server
-
+SUBDIRS = libmcclient libmissioncontrol-server
+if HAVE_LEGACY
+SUBDIRS += libmissioncontrol
+endif
diff --git a/test/Makefile.am b/test/Makefile.am
index 4923486..c65cf43 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -7,8 +7,10 @@ if HAVE_TESTS
 
 SUBDIRS = twisted
 
+if HAVE_LEGACY
 noinst_PROGRAMS = mc-client
 mc_client_SOURCES = mc-client.c
 mc_client_LDADD = $(top_builddir)/libmissioncontrol/libmissioncontrol-client.la
+endif
 
 endif
-- 
1.5.6.5