diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2023-02-13 15:08:18 +0100 |
|---|---|---|
| committer | خالد حسني <khaled@aliftype.com> | 2023-02-23 14:38:11 +0000 |
| commit | 258f3412213954448e6af0fdc252b10ff76c7d50 (patch) | |
| tree | 39e789c33e9f9375a83ff2a3edb26b44d67ad005 /configure.ac | |
| parent | 46d489ccd6f8e24fefba25118de9a72b2602b656 (diff) | |
Refer directly to static library files for Graphite2 and HarfBuzz on Linux
Just using "-L... -l..." will cause dynamic linking if a matching system
library is found.
Change-Id: I9bc3ee1fb1351336f73c3c9219526749dffe546e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146907
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@aliftype.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index c5afd41afeba..4d523b097109 100644 --- a/configure.ac +++ b/configure.ac @@ -10827,9 +10827,17 @@ dnl =================================================================== harfbuzz_required_version=5.1.0 GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC" -GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite" HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src" -HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz" +case "$_os" in + Linux) + GRAPHITE_LIBS_internal="${WORKDIR}/LinkTarget/StaticLibrary/libgraphite.a" + HARFBUZZ_LIBS_internal="${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a" + ;; + *) + GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite" + HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz" + ;; +esac libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3]) libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= $harfbuzz_required_version]) |