From f312040d789a823a66a3c044ceaf7da3064529fc Mon Sep 17 00:00:00 2001 From: Alvaro Soliverez Date: Wed, 2 Nov 2011 10:31:17 -0300 Subject: Support building for Android. This adds an autogen.sh and configure flag, --disable-submodules, to disable fetching the Wocky submodule (the flag is plural for consistency with other components), adds some missing compiler and linker flags, and adds targets for Androgenizer. Modified from a patch contributed by Derek Foreman. https://bugs.freedesktop.org/show_bug.cgi?id=42515 --- autogen.sh | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) (limited to 'autogen.sh') diff --git a/autogen.sh b/autogen.sh index b6dff981..4da1c1ff 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 building submodules +build_submodules=true +for arg in $*; do + case $arg in + --disable-submodules) + build_submodules=false + ;; +*) +;; +esac +done + +if test $build_submodules = true; 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 -- cgit v1.2.1