[Libreoffice-commits] core.git: configure.ac distro-configs/LibreOfficeAndroidAarch64.conf distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf

[Peter Foley]

 configure.ac                                  |    3 +++
 distro-configs/LibreOfficeAndroid.conf        |    3 ---
 distro-configs/LibreOfficeAndroidAarch64.conf |    3 ---
 distro-configs/LibreOfficeAndroidX86.conf     |    3 ---
 4 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 6f2b0b5de3a99b029b61079bd9a9c313305d0e12
Author: Peter Foley <pefoley2 at pefoley.com>
Date:   Mon Jan 18 17:27:34 2016 -0500

    disable options by default on android
    
    Some options aren't supported on android, so disable them by default to
    avoid errors.
    
    Change-Id: Ifef2f5ff55d3bd7d7da1f53d1345be3c5ef11f45
    Reviewed-on: https://gerrit.libreoffice.org/21590
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/configure.ac b/configure.ac
index 75d6b70..fed2b42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -811,6 +811,9 @@ linux-android*)
     enable_coinmp=yes
     enable_lpsolve=no
     enable_report_builder=no
+    enable_odk=no
+    enable_postgresql_sdbc=no
+    enable_python=no
     with_theme="tango"
     test_cups=no
     test_dbus=no
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 6fd32fa..9db6a72 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -3,9 +3,6 @@
 --disable-cups
 --disable-gstreamer-0-10
 --disable-gstreamer-1-0
---disable-odk
---disable-postgresql-sdbc
---disable-python
 --disable-randr
 --disable-randr-link
 --disable-systray
diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf b/distro-configs/LibreOfficeAndroidAarch64.conf
index a673c95..ca93713 100644
--- a/distro-configs/LibreOfficeAndroidAarch64.conf
+++ b/distro-configs/LibreOfficeAndroidAarch64.conf
@@ -3,9 +3,6 @@
 --disable-cups
 --disable-gstreamer-0-10
 --disable-gstreamer-1-0
---disable-odk
---disable-postgresql-sdbc
---disable-python
 --disable-randr
 --disable-randr-link
 --disable-systray
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index e79a2c4..e5589e8 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -3,9 +3,6 @@
 --disable-cups
 --disable-gstreamer-0-10
 --disable-gstreamer-1-0
---disable-odk
---disable-postgresql-sdbc
---disable-python
 --disable-randr
 --disable-randr-link
 --disable-systray