[Bug 42446] [PATCH] Allow building tp-gabble in Android

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=42446

--- Comment #2 from Simon McVittie <simon.mcvittie at collabora.co.uk> 2011-10-31 11:39:31 PDT ---
Comment on attachment 52963
  --> https://bugs.freedesktop.org/attachment.cgi?id=52963
generate.sh modifications

Review of attachment 52963:
 --> (https://bugs.freedesktop.org/page.cgi?id=splinter.html&bug=42446&attachment=52963)
-----------------------------------------------------------------

::: autogen.sh
@@ -21,5 @@
> -then
> -  echo "+ Setting up submodules"
> -  git submodule init
> -fi
> -git submodule update

We need this to happen by default, but you can add a way to turn it off if you
want (or just use autoreconf -i -f instead of autogen.sh, if that's all you
want).

@@ -26,5 @@
> -
> -# launch Wocky's autogen.sh
> -cd lib/ext/wocky
> -sh autogen.sh --no-configure
> -cd ../../..

We need these to happen in autogen too, unless the submodules are specifically
disabled.

@@ -34,5 @@
> -sh autogen.sh --no-configure
> -cd ../../..
> -
> -# Honor NOCONFIGURE for compatibility with gnome-autogen.sh
> -if test x"$NOCONFIGURE" = x; then

Please don't remove support for NOCONFIGURE, jhbuild uses it.

::: configure.ac
@@ -330,4 @@
>  
>  dnl Check for Wocky
>  # re-enable once Wocky has been released as a lib
> -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"lib/ext/wocky/wocky

We need this feature for non-Android platforms, so we can't just remove it; but
you can add a --with-wocky-submodule configure flag that sets the
WITH_WOCKY_SUBMODULE variable if you want, and turn off the submodule
(--without-wocky-submodule) for Android.

Or call it --with-system-wocky and reverse the meaning, if you prefer that.

@@ -335,5 @@
>  AC_SUBST(WOCKY_CFLAGS)
>  AC_SUBST(WOCKY_LIBS)
>  
>  dnl Check for tp-yell
> -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"lib/ext/telepathy-yell/telepathy-yell

Likewise for --without-yell-submodule.

@@ -377,4 @@
>             tests/suppressions/Makefile \
>             tests/twisted/Makefile \
>             lib/Makefile \
> -           lib/ext/Makefile \

Similarly, this should be conditional (and everything in that file should also
be conditional).

::: lib/ext/Makefile.am
@@ -1,1 @@
> -SUBDIRS =

lib/ext/

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.
You are the assignee for the bug.