From 0198ba86855809d07547de5e96ba4aa48233d81c Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Mon, 20 Aug 2012 12:36:40 +0300
Subject: Use graphite only if ENABLE_GRAPHITE

Change-Id: I4e3274c43e34f6b28277ac75f96ae8c146e94c40
---
 Library_merged.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Library_merged.mk')

diff --git a/Library_merged.mk b/Library_merged.mk
index da48a93df574..123e64ac80c3 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
 ))
 
 $(eval $(call gb_Library_use_externals,merged,\
-	graphite \
 	icule \
 	icuuc \
 	jpeg \
@@ -57,6 +56,12 @@ $(eval $(call gb_Library_use_externals,merged,\
 	zlib \
 ))
 
+ifeq ($(ENABLE_GRAPHITE),TRUE)
+$(eval $(call gb_Library_use_externals,merged,\
+	graphite \
+))
+endif
+
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Library_use_externals,merged,\
 	berkeleydb \
-- 
cgit