diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-17 16:39:25 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-01 12:44:20 +0100 |
| commit | 90243614b253bc2d6b3d12930f111eab5491316a (patch) | |
| tree | c05cdfa6fee9ff989bbd713ec9ca2fab96918e2c /configure.ac | |
| parent | 301443e6bebd9c68a0229df832ddcb3188b575d3 (diff) | |
Distinguish between --disable-gui and --without-x
For the static WASM build, we need to build with GUI but without
X11, as this just includes a static Qt backend.
We already have USING_X11, which indicates that the platform will
use X11 as a backend, so we can match --without-x to USING_X11=no,
independent from the --disable-gui setting.
Fitting all this into vcl/Library_vcl.mk was originally getting
quite complex, but by moving the logic into configure.ac in a
previous commit, the branching becomes way easier.
Change-Id: Ia2ddba3400b4306b609a1f64823cca75061e0593
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116125
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 2c5a8808a9ee..ac76f505ea8a 100644 --- a/configure.ac +++ b/configure.ac @@ -1172,6 +1172,7 @@ disable_x11_tests() test "$using_x11" = yes && USING_X11=TRUE if test "$using_freetype_fontconfig" = yes; then + USE_HEADLESS_CODE=TRUE if test "$using_headless_plugin" = yes; then AC_DEFINE(ENABLE_HEADLESS) ENABLE_HEADLESS=TRUE @@ -1179,6 +1180,7 @@ if test "$using_freetype_fontconfig" = yes; then fi AC_SUBST(ENABLE_HEADLESS) +AC_SUBST(USE_HEADLESS_CODE) AC_MSG_NOTICE([VCL platform uses freetype+fontconfig: $using_freetype_fontconfig]) AC_MSG_NOTICE([VCL platform uses headless plugin: $using_headless_plugin]) @@ -5220,10 +5222,6 @@ emscripten*) ;; esac -if test "$with_x" = "no"; then - AC_MSG_ERROR([Use --disable-gui instead. How can we get rid of this option? No idea where it comes from.]) -fi - DISABLE_GUI="" if test "$enable_gui" = "no"; then if test "$using_x11" != yes; then @@ -5236,6 +5234,10 @@ else fi AC_SUBST(DISABLE_GUI) +if test "$with_x" = "no"; then + USING_X11= +fi + if test "$using_x11" = yes; then if test "$USING_X11" = TRUE; then AC_DEFINE(USING_X11) @@ -5523,6 +5525,7 @@ if test "$cross_compiling" = "yes"; then --enable-icecream="$enable_icecream" \ --without-doxygen \ --without-webdav \ + --without-x \ --with-parallelism="$with_parallelism" \ --with-theme="$with_theme" \ --with-tls=openssl \ |