From e3784d646b4d4e7a003ed902402b92ee5aedaef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Thu, 25 Nov 2010 15:25:05 +0000 Subject: [PATCH] - use locally available freetype git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40713 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/software-profiles/imagemagick.cfg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/buildout/software-profiles/imagemagick.cfg b/buildout/software-profiles/imagemagick.cfg index 50fdbdbd96..6045405e60 100644 --- a/buildout/software-profiles/imagemagick.cfg +++ b/buildout/software-profiles/imagemagick.cfg @@ -2,6 +2,7 @@ parts = imagemagick extends = ../software-profiles/bzip2.cfg + ../software-profiles/freetype.cfg ../software-profiles/libjpeg.cfg ../software-profiles/libpng.cfg ../software-profiles/libtiff.cfg @@ -22,5 +23,5 @@ configure-options = --with-bzlib=${bzip2:location} --with-zlib=${zlib:location} environment = - CFLAGS=-I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include - LDFLAGS =-Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath -Wl,${jbigkit:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath -Wl,${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath -Wl,${jasper:location}/lib + CFLAGS=-I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include + LDFLAGS =-Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath -Wl,${jbigkit:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath -Wl,${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath -Wl,${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath -Wl,${freetype:location}/lib -- 2.30.9