config_host.mk.in | 1 -
configure.ac | 18 +-----------------
2 files changed, 1 insertion(+), 18 deletions(-)
New commits:
commit f7e422deac40fc47234755dfcbc50da38bb34112
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Thu Oct 23 18:52:59 2014 +0200
The android remote app is in a separate repository
so get rid of the noop-configure switch that was left
Change-Id: I95ddf0fb1639c9801b27007cc24e366c2d6084cf
diff --git a/config_host.mk.in b/config_host.mk.in
index 1631593..19bee1a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -171,7 +171,6 @@ 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 99eaf4b..964fc5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -778,7 +778,7 @@ linux-android*)
;;
esac
-if echo "$host_os" | grep -q linux-android || test "$enable_sdremote_android"
= "yes"; then
+if echo "$host_os" | grep -q linux-android ; then
if test -z "$with_android_sdk"; then
AC_MSG_ERROR([the --with-android-sdk option is mandatory])
fi
@@ -1132,12 +1132,6 @@ 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.]),
-,enable_sdremote_android=no)
-
AC_ARG_ENABLE(gconf,
AS_HELP_STRING([--disable-gconf],
[Determines whether to use the GConf support.]),
@@ -10001,16 +9995,6 @@ 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
-else
- AC_MSG_RESULT([no])
- ENABLE_SDREMOTE_ANDROID=
-fi
-AC_SUBST(ENABLE_SDREMOTE_ANDROID)
-
dnl ===================================================================
dnl Check whether the gtk 2.0 libraries are available.
dnl ===================================================================
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
