From 30f7f941909c7edd19f4081466d800d7b2e5e8ec Mon Sep 17 00:00:00 2001 From: Alvaro Soliverez Date: Wed, 2 Nov 2011 10:31:17 -0300 Subject: [PATCH 1/2] use external wocky library From a patch originally contributed by Derek Foreman --- autogen.sh | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/autogen.sh b/autogen.sh index b6dff98..e3c4720 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,18 +16,32 @@ fi autoreconf -i -f -# Fetch Wocky if needed -if test ! -f lib/ext/wocky/autogen.sh; -then - echo "+ Setting up Wocky submodule" - git submodule init -fi -git submodule update +#Check if Android build +run_android_build=false +for arg in $*; do + case $arg in + --enable-android) + run_android_build=true + ;; +*) +;; +esac +done + +if test $run_android_build = false; then + # Fetch Wocky if needed + if test ! -f lib/ext/wocky/autogen.sh; + then + echo "+ Setting up Wocky submodule" + git submodule init + fi + git submodule update -# launch Wocky's autogen.sh -cd lib/ext/wocky -sh autogen.sh --no-configure -cd ../../.. + # launch Wocky's autogen.sh + cd lib/ext/wocky + sh autogen.sh --no-configure + cd ../../.. +fi run_configure=true for arg in $*; do -- 1.7.7