diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-28 09:45:54 +0000 |
|---|---|---|
| committer | Muthu Subramanian K <muthusuba@gmail.com> | 2013-03-04 12:44:31 +0000 |
| commit | c6c886068ab9288a081efc33fa6902383e09aa3e (patch) | |
| tree | 786aa9c5849018db9e6eb7625f010b96fe299e39 | |
| parent | fc07bf037fbb169bb20226a274fdfa6626d661a6 (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/2494
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com>
Tested-by: Muthu Subramanian K <muthusuba@gmail.com>
| -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) \ |