diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-10-13 11:01:41 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-10-13 11:02:26 +0200 |
| commit | 71586837f926c5dc7e8146a4e625b57c37343806 (patch) | |
| tree | 6823b78909d4ab0b6490d0f49779cd991449e9f7 | |
| parent | 1631fa9a722553da1ebe0650a65e859862c4405d (diff) | |
Emscripten has an own zlib port, use it
See https://github.com/emscripten-ports/zlib
Change-Id: I0af6e2f1f1908838f940ab11706637e3407263fd
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeEmscripten.conf | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index eea4cbaf681e..eb0474360f00 100644 --- a/configure.ac +++ b/configure.ac @@ -7420,7 +7420,11 @@ dnl and has no pkg-config for it at least on some tinderboxes, dnl so leaving that out for now dnl libo_CHECK_SYSTEM_MODULE([zlib],[ZLIB],[zlib]) AC_MSG_CHECKING([which zlib to use]) -if test "$with_system_zlib" = "yes"; then +if test "$_os" = "Emscripten"; then + # Emscripten provides its own zlib + AC_MSG_RESULT([Emscripten provided]) + SYSTEM_ZLIB=TRUE +elif test "$with_system_zlib" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_ZLIB=TRUE AC_CHECK_HEADER(zlib.h, [], diff --git a/distro-configs/LibreOfficeEmscripten.conf b/distro-configs/LibreOfficeEmscripten.conf index b90a090b0167..b26b4cad59ee 100644 --- a/distro-configs/LibreOfficeEmscripten.conf +++ b/distro-configs/LibreOfficeEmscripten.conf @@ -37,7 +37,6 @@ --without-helppack-integration --without-system-dicts --with-theme=no ---with-system-zlib=no --with-system-nss=yes # Build fails when disabling these |