diff options
| author | Andras Timar <andras.timar@collabora.com> | 2022-03-02 09:49:51 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-03-30 12:06:28 +0200 |
| commit | d573d55c158bc631d9a34ff339095e31661c2bb6 (patch) | |
| tree | 5ca156a1e56da342a69c7b182840a051adfd6b28 /instsetoo_native | |
| parent | bc9008b7d048fe396bc8543fafde8674c11969a8 (diff) | |
Do not pull in X11 dependencies when the build is configured for LOKit
Change-Id: I44a1782cf523bbfbbbb0e0d5333364f36c7ed495
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130781
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/inc_openoffice/unix/find-requires-x11.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh index 338b7919d4ed..9fec571f5f99 100644 --- a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh +++ b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh @@ -23,5 +23,7 @@ if [[ "${OS}" == "AIX" ]]; then echo "libfreetype.a(libfreetype.so.6${mark64})" else echo "libfreetype.so.6${mark64}" - echo "libXinerama.so.1${mark64}" + if [[ "${XINERAMA_LINK}" == "dynamic" ]]; then + echo "libXinerama.so.1${mark64}" + fi fi |