configure.ac | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 258f3412213954448e6af0fdc252b10ff76c7d50
Author: Rico Tzschichholz <ric...@ubuntu.com>
AuthorDate: Mon Feb 13 15:08:18 2023 +0100
Commit: خالد حسني <kha...@aliftype.com>
CommitDate: Thu Feb 23 14:38:11 2023 +0000
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: خالد حسني <kha...@aliftype.com>
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])
