diff options
| -rw-r--r-- | android/Module_android.mk | 9 | ||||
| -rwxr-xr-x | config_host.mk.in | 1 | ||||
| -rwxr-xr-x | configure.ac | 40 |
3 files changed, 39 insertions, 11 deletions
diff --git a/android/Module_android.mk b/android/Module_android.mk index 46326bda5e2f..da984827160b 100644 --- a/android/Module_android.mk +++ b/android/Module_android.mk @@ -8,10 +8,17 @@ $(eval $(call gb_Module_Module,android)) -ifeq ($(OS),ANDROID) +ifeq ($(ENABLE_SDREMOTE_ANDROID),TRUE) $(eval $(call gb_Module_add_targets,android,\ CustomTarget_sdremote \ +)) + +endif + +ifeq ($(OS),ANDROID) + +$(eval $(call gb_Module_add_targets,android,\ CustomTarget_lo4android \ CustomTarget_android_desktop \ )) diff --git a/config_host.mk.in b/config_host.mk.in index 92c6d51ae86e..49977f1833ca 100755 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -160,6 +160,7 @@ export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@ export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@ export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@ export SYSTEM_BLUEZ=@SYSTEM_BLUEZ@ +export ENABLE_SDREMOTE_ANDROID=@ENABLE_SDREMOTE_ANDROID@ export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@ export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@ export ENABLE_SYSTRAY_GTK=@ENABLE_SYSTRAY_GTK@ diff --git a/configure.ac b/configure.ac index 14fdbfd75e84..b209742449f2 100755 --- a/configure.ac +++ b/configure.ac @@ -210,7 +210,8 @@ AC_ARG_WITH(android-ndk-toolchain-version, AC_ARG_WITH(android-sdk, AS_HELP_STRING([--with-android-sdk], - [Specify location of the Android SDK. Mandatory when building for Android.]), + [Specify location of the Android SDK. Mandatory when building for Android, + or when building the Impress Remote Android app.]), ,) ANDROID_NDK_HOME= @@ -660,19 +661,11 @@ linux-android*) AC_MSG_ERROR([the --with-android-ndk-toolchain-version option is mandatory]) fi - if test -z "$with_android_sdk"; then - AC_MSG_ERROR([the --with-android-sdk option is mandatory]) - fi - # Verify that the NDK and SDK options are proper if test ! -f "$ANDROID_NDK_HOME/platforms/android-9/arch-arm/usr/lib/libc.a"; then AC_MSG_ERROR([the --with-android-ndk option does not point to an Android NDK]) fi - if test ! -d "$ANDROID_SDK_HOME/platforms"; then - AC_MSG_ERROR([the --with-android-sdk option does not point to an Android SDK]) - fi - AC_DEFINE(HAVE_FT_FACE_GETCHARVARIANTINDEX) BUILD_TYPE="$BUILD_TYPE FONTCONFIG FREETYPE" ;; @@ -682,6 +675,16 @@ linux-android*) ;; esac +if echo "$host_os" | grep -q linux-android || test "$enable_sdremote_android" = "yes"; then + if test -z "$with_android_sdk"; then + AC_MSG_ERROR([the --with-android-sdk option is mandatory]) + fi + + if test ! -d "$ANDROID_SDK_HOME/platforms"; then + AC_MSG_ERROR([the --with-android-sdk option does not point to an Android SDK]) + fi +fi + if test "$_os" = "AIX"; then AC_PATH_PROG(GAWK, gawk) if test -z "$GAWK"; then @@ -997,7 +1000,7 @@ AC_ARG_ENABLE(packagekit, AC_ARG_ENABLE(sdremote, AS_HELP_STRING([--disable-sdremote], - [Determines whether to enable Impress remote control.]), + [Determines whether to enable Impress remote control (i.e. the server component).]), ,enable_sdremote=yes) AC_ARG_ENABLE(sdremote-bluetooth, @@ -1005,6 +1008,12 @@ AC_ARG_ENABLE(sdremote-bluetooth, [Determines whether to build sdremote with bluetooth support. Requires dbus on Linux.])) +AC_ARG_ENABLE(sdremote-android, + AS_HELP_STRING([--enable-sdremote-android], + [Determines whether to build the Impress Remote Android app -- requires + a correctly configured android sdk. Automatically enabled if ]), +,enable_sdremote_android=no) + AC_ARG_ENABLE(gconf, AS_HELP_STRING([--disable-gconf], [Determines whether to use the GConf support.]), @@ -10116,6 +10125,17 @@ AC_SUBST(ENABLE_SDREMOTE) AC_SUBST(ENABLE_SDREMOTE_BLUETOOTH) AC_SUBST(SYSTEM_BLUEZ) +AC_MSG_CHECKING([whether to enable Impress remote control android app]) +if echo "$host_os" | grep -q linux-android || test "$enable_sdremote_android" = "yes"; then + AC_MSG_RESULT([yes]) + ENABLE_SDREMOTE_ANDROID=TRUE + AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote control]) +else + ENABLE_SDREMOTE= + AC_MSG_RESULT([no]) +fi +AC_SUBST(ENABLE_SDREMOTE_ANDROID) + dnl =================================================================== dnl Check whether the gtk 2.0 libraries are available. dnl =================================================================== |