[Bug 42446] Allow building tp-gabble in Android

[bugzilla-daemon at freedesktop.org]

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

--- Comment #6 from Will Thompson <will.thompson at collabora.co.uk> 2011-11-10 07:15:30 PST ---
Comment on attachment 53017
  --> https://bugs.freedesktop.org/attachment.cgi?id=53017
Support for Android patch

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

::: autogen.sh
@@ +19,5 @@
> +#Check if Android build
> +run_android_build=false
> +for arg in $*; do
> +    case $arg in
> +        --enable-android)

For what it's worth, --enable-android doesn't actually enable or disable any
Android-specific code (as far as I can tell), it just controls whether
submodules are used. Perhaps --disable-submodules would be a better name for
the flag, and fetch_submodules a better name for the variable.

@@ +32,4 @@
>      run_configure=true
>      for arg in $*; do
>          case $arg in
>              --no-configure)

This code is duplicated in the two branches of this if block. You could pull
this out to above 'if test $run_android_build' so you don't need to duplicate
it.

::: configure.ac
@@ +330,5 @@
>  
> +dnl Check if Android build
> +AC_ARG_ENABLE(android,
> +              AC_HELP_STRING([--enable-android],[compile Android code]),
> +              android_build=$enableval, android_build=no )

So this would become

  AC_ARG_ENABLE(submodules,
    AC_HELP_STRING([--disable-submodules],
      [Use system versions of Wocky and Telepathy-Yell, rather than
submodules],
      enable_submodules=$enablevel,
      enable_submodules=yes))

@@ +336,3 @@
>  dnl Check for Wocky
>  # re-enable once Wocky has been released as a lib
> +if test x$android_build = xno; then

…and this would be

  if test x$enable_submodules = xyes; then

::: src/Makefile.am
@@ +286,5 @@
> +	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
> +	  $(AM_CFLAGS) -DBUILD_AS_ANDROID_SERVICE \
> +	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) -I../lib \
> +	 -:LDFLAGS $(libgabble_convenience_la_LIBADD) -lgio-2.0 -ldbus-1 \
> +	  -lsoup -lgabble_ext -lnice -lgcrypt -lgnutls -lxml2 -lsqlite3 \

Simon's point about this—“It would be much better if we could avoid hard-coding
these.”—hasn't been addressed.

-- 
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.