RepositoryExternal.mk | 8 ++++++++
config_host.mk.in | 2 ++
configure.ac | 3 +--
3 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit e461f7efcb77ce771835054c22ea0353555d9237
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Nov 19 14:54:55 2015 +0200
Do use libo_CHECK_SYSTEM_MODULE for GLYPHY after all
Set the CFLAGS and LIBS for it in config_host.mk.in, and handle the
SYSTEM_GLYPHY case properly in RepositoryExternal.mk.
Change-Id: I56a7fe72b675b6dd4514bbd1739b53f5871ed36a
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 42630d0..c87e0e4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -274,6 +274,14 @@ endif # SYSTEM_GLEW
ifneq ($(SYSTEM_GLYPHY),)
+define gb_LinkTarget__use_glyphy
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(GLYPHY_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(GLYPHY_LIBS))
+
+endef
else # !SYSTEM_GLYPHY
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
diff --git a/config_host.mk.in b/config_host.mk.in
index 5ed3043..33c26b7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -205,6 +205,8 @@ export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
export GLEW_CFLAGS=$(gb_SPACE)@GLEW_CFLAGS@
export GLEW_LIBS=$(gb_SPACE)@GLEW_LIBS@
export GLM_CFLAGS=$(gb_SPACE)@GLM_CFLAGS@
+export GLYPHY_CFLAGS=$(gb_SPACE)@GLYPHY_CFLAGS@
+export GLYPHY_LIBS=$(gb_SPACE)@GLYPHY_LIBS@
export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@
export GNOMEVFS_LIBS=$(gb_SPACE)@GNOMEVFS_LIBS@
export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index e154efd..30ec397 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8815,8 +8815,7 @@ dnl Check for system glyphy
dnl ===================================================================
dnl We currently use GLyphy only on Windows
if test $_os = WINNT; then
- # libo_CHECK_SYSTEM_MODULE([glyphy], [GLYPHY], [glyphy >= 0.12.0],
["-I${WORKDIR}/UnpackedTarball/glyphy/src"])
- BUILD_TYPE="$BUILD_TYPE GLYPHY"
+ libo_CHECK_SYSTEM_MODULE([glyphy], [GLYPHY], [glyphy >= 0.12.0],
["-I${WORKDIR}/UnpackedTarball/glyphy/src"])
fi
dnl ===================================================================
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
