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

[Christian Lohmaier]

 configure.ac                                  |    2 +-
 distro-configs/LibreOfficeAndroid.conf        |    1 -
 distro-configs/LibreOfficeAndroidAarch64.conf |    1 -
 distro-configs/LibreOfficeAndroidX86.conf     |    1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 9f62954369a5d77f976f616623495ad27be6b099
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Jan 15 13:25:33 2016 +0100

    Android: don't disable langtag (libetonyek has hard dependency)
    
    apparently in the past it was disabled because it did depend on glib,
    and maybe also size constraints, but neither apply anymore.
    
    Change-Id: Ic731b204cf482639e4d468512b97b5c39ddc73e6

diff --git a/configure.ac b/configure.ac
index 86192ee..c8cefd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11785,7 +11785,7 @@ ENABLE_LIBLANGTAG=
 SYSTEM_LIBLANGTAG=
 AC_MSG_CHECKING([whether to use liblangtag])
 if test "$enable_liblangtag" = "yes" -o \
-        \( "$enable_liblangtag" = "" -a $_os != Android -a $_os != iOS -a $_os != Emscripten \); then
+        \( "$enable_liblangtag" = "" -a $_os != iOS -a $_os != Emscripten \); then
     ENABLE_LIBLANGTAG=TRUE
     AC_MSG_RESULT([yes])
     AC_MSG_CHECKING([whether to use system liblangtag])
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 37c03d8..6fd32fa 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -3,7 +3,6 @@
 --disable-cups
 --disable-gstreamer-0-10
 --disable-gstreamer-1-0
---disable-liblangtag
 --disable-odk
 --disable-postgresql-sdbc
 --disable-python
diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf b/distro-configs/LibreOfficeAndroidAarch64.conf
index 8daaa9c..a673c95 100644
--- a/distro-configs/LibreOfficeAndroidAarch64.conf
+++ b/distro-configs/LibreOfficeAndroidAarch64.conf
@@ -3,7 +3,6 @@
 --disable-cups
 --disable-gstreamer-0-10
 --disable-gstreamer-1-0
---disable-liblangtag
 --disable-odk
 --disable-postgresql-sdbc
 --disable-python
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index 41015e7..e79a2c4 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -3,7 +3,6 @@
 --disable-cups
 --disable-gstreamer-0-10
 --disable-gstreamer-1-0
---disable-liblangtag
 --disable-odk
 --disable-postgresql-sdbc
 --disable-python