[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cairo/ExternalProject_cairo.mk

[Caolán McNamara]

 cairo/ExternalProject_cairo.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e69aa2d29342e90558e1d86b0f89418b8bdb0e34
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 28 09:45:54 2013 +0000

    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 at iki.fi>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk
index 54a220b..de3994f 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) \