diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-11-21 16:28:14 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-11-21 16:28:14 +0100 |
| commit | ec6013c88a7fa59f61a928c2ee7aabed8cbb96c7 (patch) | |
| tree | 1f2caf29b89193bc4c9e3996f913a6a39c2886d1 /RepositoryExternal.mk | |
| parent | 024cf92581add62866544ae604ff53c89a764ace (diff) | |
Revert "Xlib import via generic pkg-config"
It breaks our baseline Linux release builds where x11_extensions
headers are actually used.
This reverts commit 3f00bc6717964c2d4db26093b64a68f93c7de906.
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 349f83a3864e..9790e4a777a5 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2025,9 +2025,25 @@ endif # SYSTEM_LIBORCUS ifeq ($(GUIBASE),unx) +# TODO: do we really need these X11 headers in the repo? +ifneq ($(filter X11_EXTENSIONS,$(BUILD_TYPE)),) + +define gb_LinkTarget__use_x11extensions +$(call gb_LinkTarget_use_packages,$(1),\ + x11_extensions_inc \ +) +endef + +else # !X11_EXTENSIONS + +gb_LinkTarget__use_x11extensions := + +endif # X11_EXTENSIONS + ifeq ($(XRANDR_DLOPEN),FALSE) define gb_LinkTarget__use_Xrandr +$(call gb_LinkTarget__use_x11extensions,$(1)) $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ @@ -2042,6 +2058,7 @@ endef else # XRANDR_DLOPEN define gb_LinkTarget__use_Xrandr +$(call gb_LinkTarget__use_x11extensions,$(1)) $(call gb_LinkTarget_add_defs,$(1),\ -DXRANDR_DLOPEN \ @@ -2051,6 +2068,7 @@ endef endif # XRANDR_DLOPEN define gb_LinkTarget__use_Xrender +$(call gb_LinkTarget__use_x11extensions,$(1)) $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ |