From b802edfe06b2bce1f591ded2a66d483928cf32d7 Mon Sep 17 00:00:00 2001
From: Alvaro Soliverez <alvaro.soliverez@collabora.co.uk>
Date: Thu, 23 Feb 2012 15:00:37 -0300
Subject: [PATCH] Add option to build with shared Wocky library

---
 Android.mk   |    2 +-
 configure.ac |   15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Android.mk b/Android.mk
index c1ac105..ada4c08 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,7 +20,7 @@ ytstenut-plugins-configure-real:
 	PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \
 	$(YTSTENUT_PLUGINS_TOP)/$(CONFIGURE) --host=arm-linux-androideabi \
 		--disable-spec-documentation --disable-qt4 \
-		--disable-Werror && \
+		--disable-Werror --with-shared-wocky && \
 	for file in $(YTSTENUT_PLUGINS_BUILT_SOURCES); do \
 		rm -f $$file && \
 		make -C $$(dirname $$file) $$(basename $$file) ; \
diff --git a/configure.ac b/configure.ac
index bd73ff3..f3f2376 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,9 +131,18 @@ fi
 
 # ------------------------------------------------------------------------------
 
-PKG_CHECK_MODULES(WOCKY, wocky >= 0.0.0)
-AC_SUBST(WOCKY_CFLAGS)
-AC_SUBST(WOCKY_LIBS)
+dnl Check if Android build
+AC_ARG_WITH(shared-wocky,
+            AS_HELP_STRING([--with-shared-wocky],[Use system versions of Wocky]),
+            shared_wocky=$withval, shared_wocky=no )
+
+dnl Check for Wocky
+# re-enable once Wocky has been released as a lib
+if test x$shared_wocky = xyes; then
+  PKG_CHECK_MODULES(WOCKY, wocky >= 0.0.0)
+  AC_SUBST(WOCKY_CFLAGS)
+  AC_SUBST(WOCKY_LIBS)
+fi
 
 AC_ARG_ENABLE(debug,
 	AC_HELP_STRING([--enable-debug],
-- 
1.7.7.3