summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2022-11-29 13:59:06 +0200
committerThorsten Behrens <thorsten.behrens@allotropia.de>2022-11-30 14:59:54 +0100
commit85b9961c93446e7088d3be97b5977f1deaa16daf (patch)
tree02d1c60625eae530a602a13faff2ae0dd8726608
parent044e6583eb2e70c5a0c106b47b73d9d8df910689 (diff)
Make it possible build for WASM with --disable-gui, without Qt5
The various configury options here are a bit confusing, but this works at least for me. Change-Id: Ic9b04d40414d7d630d5a854295ce23b6e72a724a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143486 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 22589f700099..c954d6221b77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1156,7 +1156,7 @@ emscripten)
# API currently just exists in headers, not code
usable_dlapi=no
using_freetype_fontconfig=yes
- using_x11=no
+ using_x11=yes
test_openldap=no
test_qt5=yes
test_split_debug=yes
@@ -5429,7 +5429,7 @@ if test "$with_x" = "no"; then
USING_X11=
fi
-if test -z "$USING_X11" -a "$DISABLE_DYNLOADING" = TRUE -a "$enable_gen" = "yes"; then
+if test -z "$USING_X11" -a "$enable_qt5" = "yes" -a "$enable_gen" = "yes"; then
AC_MSG_ERROR([Can't select gen VCL plugin, if --without-x is used!])
fi