diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2024-08-15 10:04:47 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2024-08-15 18:51:17 +0200 |
| commit | e8d59edf9dddf809a08cf827235ebb033590f819 (patch) | |
| tree | 11f5c9296e8157913bea0c8d82bb99ce86b709d1 | |
| parent | 2a9f97a26ffe2ef78e71c41a2310a269ed4a6f7c (diff) | |
desktop: Fix '--enable-gui --without-x' build
The code in this block is X11-specific, so
make it conditional on `USING_X11`, not
`HAVE_FEATURE_UI`.
This fixes an `--enable-gui --without-x` build
that previously failed like this
ld.lld: error: undefined symbol: XineramaQueryScreens
>>> referenced by splashx.c:441 (desktop/unx/source/splashx.c:441)
>>> .../libreoffice/workdir/CObject/desktop/unx/source/splashx.o:(splash_init_display)
[AIN] draw_brand
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make[1]: *** [.../libreoffice/desktop/Executable_oosplash.mk:10: .../libreoffice/instdir/program/oosplash] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:296: build] Error 2
Change-Id: If02395d2461de4b6aac340898ce99583653d45c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171894
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | desktop/unx/source/splashx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c index 4dc50a740695..13fe6ef679f4 100644 --- a/desktop/unx/source/splashx.c +++ b/desktop/unx/source/splashx.c @@ -7,10 +7,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <config_features.h> +#include <config_vclplug.h> #include "splashx.h" -#if defined(ENABLE_QUICKSTART_LIBPNG) && HAVE_FEATURE_UI +#if defined(ENABLE_QUICKSTART_LIBPNG) && USING_X11 #include <X11/Xlib.h> #include <X11/Xatom.h> |