diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-24 14:16:03 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-24 16:52:01 +0200 |
| commit | 4eb68428f676121340bb1533742635f28081e26a (patch) | |
| tree | a4e538d028a29ec93ff78c33384173acf94fe8bd | |
| parent | 0f8a90cff1106e5df7d56d9677e547b84d52cfe8 (diff) | |
stop delivering fontconfig headers
Change-Id: Idb11e26ddf19c5424b838586dbd1d8d34a93cf23
| -rw-r--r-- | RepositoryExternal.mk | 22 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | fontconfig/ExternalPackage_fontconfig.mk | 6 |
4 files changed, 22 insertions, 15 deletions
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 diff --git a/config_host.mk.in b/config_host.mk.in index fa858770ef3e..f06a5d9db633 100644 --- a/config_host.mk.in +++ b/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@ diff --git a/configure.ac b/configure.ac index bb603a9ae05c..35b2aad02a6f 100644 --- a/configure.ac +++ b/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 =================================================================== diff --git a/fontconfig/ExternalPackage_fontconfig.mk b/fontconfig/ExternalPackage_fontconfig.mk index 7f074e8ee15c..bee7f01d94af 100644 --- a/fontconfig/ExternalPackage_fontconfig.mk +++ b/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 \ )) |