Attachment 57525 Details for Bug 46494 – Option to build with shared wocky library

[patch] Option to build with shared wocky library

0001-Add-option-to-build-with-shared-Wocky-library.patch (text/plain), 1.62 KB, created by Alvaro Soliverez on 2012-02-23 06:20:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alvaro Soliverez

Created: 2012-02-23 06:20:04 UTC

Size: 1.62 KB

patch

obsolete

>From 3b3bbf0003e0f403874876cfd417e33c151e86ad Mon Sep 17 00:00:00 2001
>From: Alvaro Soliverez <alvaro.soliverez@collabora.co.uk>
>Date: Thu, 23 Feb 2012 11:18:39 -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..30a2967 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,
>+              AS_HELP_STRING([--without-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
>

Actions: View | Splinter Review

Attachments on bug 46494: 57499 | 57525 | 57540

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.