[Libreoffice-commits] core.git: external/cairo

[Caolán McNamara]

 external/cairo/ExternalProject_cairo.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a41d501381f2a9face6e57bbaa131ef8f8c977ab
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 8 11:27:50 2016 +0000

    build internal cairo without X support in --disable-gui mode
    
    Change-Id: Id27fb0b0b25adebccc8ca2fa6182a483a0d0c1de

diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk
index 71315b2..edf3071 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) \