[Libreoffice-commits] .: cairo/cairo

[Caolán McNamara]

 cairo/cairo/makefile.mk |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 276b1c15917054229a63c9da4bf01284c653ddad
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 30 12:23:28 2011 +0100

    this must be the bit I missed

diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index a8f6423..5cae5f0 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -184,12 +184,10 @@ OUT2INC+=src$/cairo-xlib.h \
 .IF "$(OS)" != "WNT" || "$(COM)" == "GCC"
 # all other platforms except vanilla WNT, which does not use configure
 
-.IF "$(BUILD_PIXMAN)" == "YES"
 # pixman is in this module
 # We include paths to this module also in LDFLAGS/CFLAGS to guarantee search order.
 # However pixman_* vars need to be also set for configure to work properly on all platforms.
 CONFIGURE_FLAGS+=pixman_CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc" pixman_LIBS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib -lpixman-1"
-.ENDIF
 
 .IF "$(debug)"!=""
 cairo_CFLAGS+=-g