summaryrefslogtreecommitdiffstats
path: root/external/cairo
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-12-08 11:27:50 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-12-08 11:28:51 +0000
commita41d501381f2a9face6e57bbaa131ef8f8c977ab (patch)
tree42bb9a769e3e9668cffe41f1d3588e2706f37613 /external/cairo
parentReplace manual acquire/release calls with rtl::Reference (diff)
downloadcore-a41d501381f2a9face6e57bbaa131ef8f8c977ab.tar.gz
core-a41d501381f2a9face6e57bbaa131ef8f8c977ab.zip
build internal cairo without X support in --disable-gui mode
Change-Id: Id27fb0b0b25adebccc8ca2fa6182a483a0d0c1de
Diffstat (limited to 'external/cairo')
-rw-r--r--external/cairo/ExternalProject_cairo.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk
index 71315b292676..edf30711598f 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -53,7 +53,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
$(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include") \
$(if $(SYSTEM_FONTCONFIG),,FONTCONFIG_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,fontconfig)") \
$(if $(filter ANDROID IOS,$(OS)),--disable-shared,--disable-static) \
- $(if $(filter ANDROID IOS,$(OS)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb) \
+ $(if $(filter ANDROID IOS,$(OS)),--disable-xlib --disable-xcb,$(if $(filter TRUE,$(ENABLE_HEADLESS)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb)) \
$(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \
--disable-valgrind \
$(if $(filter IOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \