[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit f22f58af9dd896ddc958a083ca883a5f2b88b2dc
Author: David Tardon <dtardon at redhat.com>
Date:   Fri May 30 19:50:24 2014 +0200

    only def graphite external if --enable-graphite
    
    Change-Id: I58271b5138b6dda4c448af63146a2f2171cb61a1
    (cherry picked from commit 026dc56eb7deb7c49b6d54875a697d4a431082fe)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 240a7fe..ada101e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1321,6 +1321,8 @@ endef
 
 endif # SYSTEM_FONTCONFIG
 
+ifeq ($(ENABLE_GRAPHITE),TRUE)
+
 ifneq ($(SYSTEM_GRAPHITE),)
 
 define gb_LinkTarget__use_graphite
@@ -1348,6 +1350,12 @@ endef
 
 endif # SYSTEM_GRAPHITE
 
+else # !ENABLE_GRAPHITE
+
+gb_LinkTarget__use_graphite :=
+
+endif # ENABLE_GRAPHITE
+
 ifneq ($(SYSTEM_ICU),)
 
 gb_LinkTarget__use_icu_headers:=