configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9cd47a6594322b4b77835660c547b25d831f5f4a
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Nov 25 17:01:49 2016 +0100
configure: fix harfbuzz build on WNT
The graphite library is always built static, so the graphite headers must
be included with the GRAPHITE2_STATIC macro, so that the functions are
not marked __declspec(dllimport) on WNT.
Add GRAPHITE2_STATIC to GRAPHITE_CFLAGS so harfbuzz picks it up.
It's a mystery why vcl even links currently without this.
Change-Id: I80d87fe76afa2d05a5697d56dfaf8cbe97d9f977
(cherry picked from commit 086631af59636cd9a6a45b747a1bc59b4b547794)
Reviewed-on: https://gerrit.libreoffice.org/31210
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 194cbb1..6e3a992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9186,7 +9186,7 @@ AC_SUBST(ICU_LIBS)
dnl ===================================================================
dnl Graphite
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >=
0.9.3],["-I${WORKDIR}/UnpackedTarball/graphite/include"],["-L${WORKDIR}/LinkTarget/StaticLibrary
-lgraphite"])
+libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >=
0.9.3],["-I${WORKDIR}/UnpackedTarball/graphite/include
-DGRAPHITE2_STATIC"],["-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"])
if test "$with_system_graphite" = "yes"; then
libo_MINGW_CHECK_DLL([libgraphite2])
fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
