diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-28 09:45:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-28 09:46:01 +0000 |
| commit | c0f85e6879e527ff0673c82e84e8ee0afcc6a5ec (patch) | |
| tree | cc50ecef0505f3b44667fc39ca70ece839565343 /cairo | |
| parent | b1c0d8a7cbbf60cc6725727f61880e27e7e6346f (diff) | |
Resolves: fdo#61571 cairo not linking against internal libpng
the flag is called SYSTEM_LIBPNG not SYSTEM_PNG
Change-Id: I703a669f544e539f7fcfa64c0121a73f0608aecc
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/ExternalProject_cairo.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk index 8d2118989fcf..42a5c7f618bd 100644 --- a/cairo/ExternalProject_cairo.mk +++ b/cairo/ExternalProject_cairo.mk @@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \ COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \ ZLIB3RDLIB=-lz \ - $(if $(filter NO,$(SYSTEM_PNG)),png_CFLAGS="-I$(OUTDIR)/inc/external/libpng" png_LIBS="-L$(OUTDIR)/lib -lpng") \ + $(if $(filter NO,$(SYSTEM_LIBPNG)),png_CFLAGS="-I$(OUTDIR)/inc/external/libpng" png_LIBS="-L$(OUTDIR)/lib -lpng") \ $(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \ $(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \ |