From ba84bd4af910a0267cce33fef4626534881ab57e Mon Sep 17 00:00:00 2001 From: Alvaro Soliverez Date: Thu, 23 Feb 2012 00:59:36 -0300 Subject: [PATCH] In Android, it is necessary to acquire wocky libs and cflags --- Android.mk | 2 +- configure.ac | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Android.mk b/Android.mk index c1ac105..f9ea1c4 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 --disable-submodules && \ 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..227de3a 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_ENABLE(submodules, + AS_HELP_STRING([--disable-submodules],[Use system versions of Wocky, rather than submodules]), + build_submodules=$enableval, build_submodules=yes ) + +dnl Check for Wocky +# re-enable once Wocky has been released as a lib +if test x$build_submodules = xno; 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