From 4eb68428f676121340bb1533742635f28081e26a Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Fri, 24 May 2013 14:16:03 +0200
Subject: stop delivering fontconfig headers

Change-Id: Idb11e26ddf19c5424b838586dbd1d8d34a93cf23
---
 RepositoryExternal.mk | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'RepositoryExternal.mk')

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0ae508db9268..4a2ac5dcd239 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1048,20 +1048,36 @@ endif
 
 endef
 
+ifeq ($(SYSTEM_FONTCONFIG),YES)
+
 define gb_LinkTarget__use_fontconfig
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 	$(FONTCONFIG_CFLAGS) \
 )
 
-ifneq ($(OS),ANDROID)
 $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS))
-else
+
+endef
+
+else # ! SYSTEM_FONTCONFIG
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
+	fontconfig \
+))
+
+define gb_LinkTarget__use_fontconfig
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,fontconfig) \
+	$$(INCLUDE) \
+)
+
 $(call gb_LinkTarget_use_static_libraries,$(1),fontconfig)
-endif
 
 endef
 
+endif # SYSTEM_FONTCONFIG
+
 ifeq ($(SYSTEM_GRAPHITE),YES)
 
 define gb_LinkTarget__use_graphite
-- 
cgit