diff options
| author | Korrawit Pruegsanusak <detective.conan.1412@gmail.com> | 2016-03-20 15:07:00 +0700 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-03-24 13:15:04 +0100 |
| commit | 7a973748f8080117bac908edb385de1c9c5e8179 (patch) | |
| tree | 95684bd2c33cb89e8b0aad93987df47da540f574 /external | |
| parent | a5867a0d676981c27b36a4def9b423fabf6862e8 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 856038857f566269d8b21fc1c86aa4b5eb7ae048)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index d204514a29db..61a7097c4e35 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -40,7 +40,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) \ |