configure.ac | 3 ++- distro-configs/LibreOfficeEmscripten.conf | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 233bfee7046ecd4cbc45647ee8908ce9135e7276 Author: Samuel Mehrbrodt <[email protected]> Date: Tue Oct 13 16:21:33 2015 +0200 Emscripten: Don't build liblangtag Change-Id: Ie0e8aa9928f59f97cdee5c082694f9af474e1473 diff --git a/configure.ac b/configure.ac index 812450d..ddebf29 100644 --- a/configure.ac +++ b/configure.ac @@ -11745,7 +11745,8 @@ dnl =================================================================== 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 \); then +if test "$enable_liblangtag" = "yes" -o + \( "$enable_liblangtag" = "" -a $_os != Android -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/LibreOfficeEmscripten.conf b/distro-configs/LibreOfficeEmscripten.conf index b26b4ca..07b20ba 100644 --- a/distro-configs/LibreOfficeEmscripten.conf +++ b/distro-configs/LibreOfficeEmscripten.conf @@ -31,13 +31,14 @@ --disable-scripting --disable-graphite --disable-orcus +--disable-liblangtag --without-fonts --without-java --without-junit --without-helppack-integration --without-system-dicts --with-theme=no ---with-system-nss=yes +--with-system-nss # Build fails when disabling these #--disable-cairo-canvas _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
