WASM encode some more fixed configure options

... and update README.wasm

Change-Id: Id4b8499dc2154466036f39150386d575a348a3ef

3 files changed, 15 insertions, 13 deletions

diff --git a/README.wasm b/README.wasm
index 3e201737bd24..cbc08a40a490 100644
--- a/README.wasm
+++ b/README.wasm
@@ -47,12 +47,13 @@ make -j<CORES> module-qtbase module-qtdeclarative
 
 Building with examples will break with some of them, but at that point Qt already works.
 
-Checking for target architecture... Project ERROR: target architecture detection binary not found.
+At some point Qt configure failed for me with:
+"Checking for target architecture... Project ERROR: target architecture detection binary not found."
 
 What seems to have fixed this was to run "emsdk activate 1.39.8" again.
 
 Current Qt fails to start the demo webserver: https://bugreports.qt.io/browse/QTCREATORBUG-24072
-Use: emrun --serve_after_close to run Qt WASM demos
+Use "emrun --serve_after_close" to run Qt WASM demos
 
 Enabling multi-thread support in Firefox is a bit of work with older versions:
 - https://bugzilla.mozilla.org/show_bug.cgi?id=1477743#c7
@@ -62,7 +63,7 @@ Enabling multi-thread support in Firefox is a bit of work with older versions:
 
 == Setup LO ==
 
-Currently autogen.sh is patched to use emconfigure. That basically sets various environment vars,
+autogen.sh is patched to use emconfigure. That basically sets various environment vars,
 especially EMMAKEN_JUST_CONFIGURE, which will create the correct output file names, checked by
 configure (a.out).
 
@@ -80,7 +81,6 @@ QT5DIR=/dir/of/git_qt5/qtbase
 --disable-firebird-sdbc
 --disable-gio
 --disable-gstreamer-1-0
---disable-gtk3
 --disable-ldap
 --disable-lpsolve
 --disable-mariadb-sdbc
@@ -96,15 +96,14 @@ QT5DIR=/dir/of/git_qt5/qtbase
 --disable-scripting
 --disable-sdremote-bluetooth
 --enable-ccache
---enable-qt5
---without-fonts
 --without-helppack-integration
 --without-java
 --without-junit
 --without-system-dicts
+--with-fonts
 --with-theme=no
 
-Will also be encoded in configure.ac at some point, some already is.
+Many will also be encoded in configure.ac at some point, some already is.
 
 
 = Ideas for an UNO bridge implementation =
@@ -186,9 +185,6 @@ We're also using emconfigure at the moment. Originally I patched emscripten, bec
 woulden't create the correct a.out file for C++ configure tests. Later I found that
 the emconfigure sets EMMAKEN_JUST_CONFIGURE to work around the problem.
 
-But it sets many more environment variables with "em<tool>" variants. This can all be moved
-into LO configure later.
-
 ICU bug: https://github.com/emscripten-core/emscripten/issues/10129
 Alternative, probably: https://developer.mozilla.org/de/docs/Web/JavaScript/Reference/Global_Objects/Intl
 
diff --git a/configure.ac b/configure.ac
index 933db793435b..8c163ed79505 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2931,7 +2931,7 @@ fi
 if test -z "$enable_scripting"; then
     # Disable scripting for iOS unless specifically overridden
     # with --enable-scripting.
-    if test $_os != iOS; then
+    if test $_os != iOS -o $_os = Emscripten; then
         enable_scripting=yes
     fi
 fi
@@ -2945,7 +2945,7 @@ else
     SCPDEFS="$SCPDEFS -DDISABLE_SCRIPTING"
 fi
 
-if test $_os = iOS -o $_os = Android; then
+if test $_os = iOS -o $_os = Android -o $_os = Emscripten; then
     # Disable dynamic_loading always for iOS and Android
     enable_dynamic_loading=no
 elif test -z "$enable_dynamic_loading"; then
@@ -5269,6 +5269,7 @@ if test "$cross_compiling" = "yes"; then
     test -n "$PKG_CONFIG_FOR_BUILD" && export PKG_CONFIG="$PKG_CONFIG_FOR_BUILD"
     cd CONF-FOR-BUILD
 
+    # Handle host configuration, which affects the cross-toolset too
     sub_conf_opts=""
     test -n "$enable_ccache" && sub_conf_opts="$sub_conf_opts --enable-ccache=$enable_ccache"
     test -n "$with_ant_home" && sub_conf_opts="$sub_conf_opts --with-ant-home=$with_ant_home"
@@ -5554,8 +5555,9 @@ if test "$USING_X11" != TRUE; then
 fi
 
 if test "$OS" = "EMSCRIPTEN"; then
-    enable_cairo_canvas=yes
     test_qt5=yes
+    enable_cairo_canvas=yes
+    enable_qt5=yes
 fi
 
 if test "$OS" = "HAIKU"; then
diff --git a/solenv/bin/run-configure b/solenv/bin/run-configure
index 9a0f2724f3a8..9758ff1d86c6 100755
--- a/solenv/bin/run-configure
+++ b/solenv/bin/run-configure
@@ -1,5 +1,9 @@
 #!/bin/sh
+
+# We could run emconfigure here, but LO's gbuild should have set up everything
+# correctly. If something breaks because of this, we likely have mre problems.
 if test "$OS" = "EMSCRIPTEN"; then
     export EMMAKEN_JUST_CONFIGURE=1
 fi
+
 exec "$@"