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

[nobody at svn.erp5.org]

Author: luke
Date: Thu Nov 25 16:17:32 2010
New Revision: 40710

URL: http://svn.erp5.org?rev=40710&view=rev
Log:
 - use locally provided jasper

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=40710&r1=40709&r2=40710&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] Thu Nov 25 16:17:32 2010
@@ -5,6 +5,7 @@ extends =
   ../software-profiles/libjpeg.cfg
   ../software-profiles/libpng.cfg
   ../software-profiles/libtiff.cfg
+  ../software-profiles/jasper.cfg
   ../software-profiles/jbigkit.cfg
   ../software-profiles/zlib.cfg
 
@@ -21,5 +22,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
-  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
+  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