diff options
| author | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2012-02-23 15:00:37 -0300 |
|---|---|---|
| committer | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2012-02-23 15:00:37 -0300 |
| commit | b802edfe06b2bce1f591ded2a66d483928cf32d7 (patch) | |
| tree | 651d253170aa239c32ff0f42c2afeae26742bb69 | |
| parent | d1539af190a62acc0fa7725ebae807a491a0c764 (diff) | |
Add option to build with shared Wocky library
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | configure.ac | 15 |
2 files changed, 13 insertions, 4 deletions
@@ -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], |