diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-01-15 13:25:33 +0100 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-01-15 13:27:37 +0100 |
commit | 9f62954369a5d77f976f616623495ad27be6b099 (patch) | |
tree | 7122929360926aab745834515ea028a7fa9c1052 | |
parent | 228bccb7bc7d7500fb630885d7fc7cb22ae43507 (diff) |
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
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | distro-configs/LibreOfficeAndroid.conf | 1 | ||||
-rw-r--r-- | distro-configs/LibreOfficeAndroidAarch64.conf | 1 | ||||
-rw-r--r-- | distro-configs/LibreOfficeAndroidX86.conf | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 86192ee0b556..c8cefd4f45c1 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 37c03d8e525e..6fd32fa9282e 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 8daaa9c77a4c..a673c95aad6e 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 41015e7e8035..e79a2c4fee34 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 |