stop delivering fontconfig headers

Change-Id: Idb11e26ddf19c5424b838586dbd1d8d34a93cf23

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

config_host.mk.in

@@ -459,6 +459,7 @@ export SYSTEM_CPPUNIT=@SYSTEM_CPPUNIT@
 export SYSTEM_CURL=@SYSTEM_CURL@
 export SYSTEM_DICTS=@SYSTEM_DICTS@
 export SYSTEM_EXPAT=@SYSTEM_EXPAT@
+export SYSTEM_FONTCONFIG=@SYSTEM_FONTCONFIG@
 export SYSTEM_GENBRK=@SYSTEM_GENBRK@
 export SYSTEM_GENCCODE=@SYSTEM_GENCCODE@
 export SYSTEM_GENCMN=@SYSTEM_GENCMN@

configure.ac

@@ -4341,15 +4341,11 @@ AC_SUBST(ENABLE_CUPS)
 # fontconfig checks
 if test "$test_fontconfig" = "yes"; then
     PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
-else
-    case "$BUILD_TYPE" in
-    *FONTCONFIG*)
-        FONTCONFIG_LIBS="-lfontconfig"
-        ;;
-    esac
+    SYSTEM_FONTCONFIG=YES
 fi
 AC_SUBST(FONTCONFIG_CFLAGS)
 AC_SUBST(FONTCONFIG_LIBS)
+AC_SUBST([SYSTEM_FONTCONFIG])
 
 dnl whether to find & fetch external tarballs?
 dnl ===================================================================

fontconfig/ExternalPackage_fontconfig.mk

@@ -11,12 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fontconfig,fontconfig))
 
 $(eval $(call gb_ExternalPackage_use_external_project,fontconfig,fontconfig))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fontconfig,inc/fontconfig,\
-	fontconfig/fcfreetype.h \
-	fontconfig/fcprivate.h \
-	fontconfig/fontconfig.h \
-))
-
 $(eval $(call gb_ExternalPackage_add_files,fontconfig,lib,\
 	src/.libs/libfontconfig.a \
 ))