diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 18 |
2 files changed, 1 insertions, 18 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 16315935a35c..19bee1a2496e 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 99eaf4bb9dec..964fc5b313dd 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 =================================================================== |