fontconfig uses pkg-config to detect freetype now

Change-Id: I12cc3a8a36aeafd5184eee4051bc798c22769d8c

RepositoryExternal.mk

@@ -1266,12 +1266,6 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 endef
 
-define gb_LinkTarget__use_freetype
-$(call gb_LinkTarget_use_external,$(1),freetype_headers)
-$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
-
-endef
-
 gb_ExternalProject__use_freetype :=
 
 else
@@ -1279,21 +1273,12 @@ else
 define gb_LinkTarget__use_freetype_headers
 $(call gb_LinkTarget_use_external_project,$(1),freetype)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,freetype)/include \
+	$(FREETYPE_CFLAGS) \
 	$$(INCLUDE) \
 )
 
 endef
 
-define gb_LinkTarget__use_freetype
-$(call gb_LinkTarget_use_external,$(1),freetype_headers)
-
-$(call gb_LinkTarget_add_libs,$(1),\
-    -L$(call gb_UnpackedTarball_get_dir,freetype)/instdir/lib -lfreetype \
-)
-
-endef
-
 define gb_ExternalProject__use_freetype
 $(call gb_ExternalProject_use_external_project,$(1),freetype)
 
@@ -1301,6 +1286,12 @@ endef
 
 endif # SYSTEM_FREETYPE
 
+define gb_LinkTarget__use_freetype
+$(call gb_LinkTarget_use_external,$(1),freetype_headers)
+$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
+
+endef
+
 ifneq ($(SYSTEM_FONTCONFIG),)
 
 define gb_LinkTarget__use_fontconfig

configure.ac

@@ -7925,6 +7925,9 @@ if test  "$test_freetype" = "yes"; then
     FilterLibs "${FREETYPE_LIBS}"
     FREETYPE_LIBS="${filteredlibs}"
     SYSTEM_FREETYPE=TRUE
+else
+    FREETYPE_CFLAGS="${ISYSTEM}${WORKDIR}/UnpackedTarball/freetype/include"
+    FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib -lfreetype"
 fi
 AC_SUBST(FREETYPE_CFLAGS)
 AC_SUBST(FREETYPE_LIBS)

external/fontconfig/ExternalProject_fontconfig.mk

@@ -26,7 +26,6 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
 			$(if $(filter ANDROID,$(OS)),--with-arch=arm) \
 			--with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \
 			--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
-			--with-freetype-config=$(call gb_UnpackedTarball_get_dir,freetype)/instdir/bin/freetype-config \
 			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 		&& $(MAKE) \
 	)