diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-28 09:45:54 +0000 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-03-02 05:51:53 +0000 |
| commit | e69aa2d29342e90558e1d86b0f89418b8bdb0e34 (patch) | |
| tree | 5529f523498fd5231b467fa352fa86b63302017d /cairo | |
| parent | 569b4ed7a68751edafcca0b79e5c25d2370f96a4 (diff) | |
Resolves: fdo#61571 cairo not linking against internal libpng
the flag is called SYSTEM_LIBPNG not SYSTEM_PNG
Change-Id: I703a669f544e539f7fcfa64c0121a73f0608aecc
(cherry picked from commit c0f85e6879e527ff0673c82e84e8ee0afcc6a5ec)
Reviewed-on: https://gerrit.libreoffice.org/2462
Reviewed-by: Niko Rönkkö <ronkko@iki.fi>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
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 54a220b459e1..de3994f1fe1e 100644 --- a/cairo/ExternalProject_cairo.mk +++ b/cairo/ExternalProject_cairo.mk @@ -40,7 +40,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) \ |