From 856038857f566269d8b21fc1c86aa4b5eb7ae048 Mon Sep 17 00:00:00 2001 From: Korrawit Pruegsanusak Date: Sun, 20 Mar 2016 15:07:00 +0700 Subject: FREETYPE_CFLAGS is already set when using external freetype When you're on Debian derivatives, using internal cairo but external (system's) freetype, the "ft2build.h" is in /usr/include/freetype2/, not /usr/include/, which is already in FREETYPE_CFLAGS since configure.ac Change-Id: I24c697776bd77d423ebeafd38315cb76cad28f9b Reviewed-on: https://gerrit.libreoffice.org/23334 Tested-by: Jenkins Reviewed-by: Michael Stahl --- external/cairo/ExternalProject_cairo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'external') diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index e74f5f0719d8..6bbe957683cf 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -45,7 +45,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : ZLIB3RDLIB="$(if $(SYSTEM_ZLIB),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \ png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \ png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \ - FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include" \ + $(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include") \ FONTCONFIG_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,fontconfig)" \ $(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID,$(OS)),--disable-shared,--disable-static) \ -- cgit v1.2.3