[Erp5-report] r40698 luke - /erp5/trunk/buildout/software-profiles/imagemagick.cfg

[nobody at svn.erp5.org]

Author: luke
Date: Thu Nov 25 15:45:48 2010
New Revision: 40698

URL: http://svn.erp5.org?rev=40698&view=rev
Log:
 - use locally available libjpeg, libtiff and jbigkit

Modified:
    erp5/trunk/buildout/software-profiles/imagemagick.cfg

Modified: erp5/trunk/buildout/software-profiles/imagemagick.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/imagemagick.cfg?rev=40698&r1=40697&r2=40698&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] Thu Nov 25 15:45:48 2010
@@ -2,6 +2,9 @@
 parts = imagemagick
 extends =
   ../software-profiles/bzip2.cfg
+  ../software-profiles/libjpeg.cfg
+  ../software-profiles/libtiff.cfg
+  ../software-profiles/jbigkit.cfg
   ../software-profiles/zlib.cfg
 
 [imagemagick]
@@ -15,4 +18,5 @@ configure-options =
   --with-bzlib=${bzip2:location}
   --with-zlib=${zlib:location}
 environment =
-  LDFLAGS =-Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  CFLAGS=-I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff: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