[Erp5-report] r40743 kazuhiko - /erp5/trunk/buildout/software-profiles/imagemagick.cfg

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Nov 25 22:00:31 2010
New Revision: 40743

URL: http://svn.erp5.org?rev=40743&view=rev
Log:
* define CPPFLAGS, not CFLAGS to specify header locations.
* -L for bzip2 and jpeg are required otherwise configure script cannot find it.
* add freetype-config location in PATH
* add bzip2 and zlib header locations.

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=40743&r1=40742&r2=40743&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] Thu Nov 25 22:00:31 2010
@@ -23,5 +23,6 @@ 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 -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
+  PATH=${freetype:location}/bin:%(PATH)s
+  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -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 =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath -Wl,${jbigkit:location}/lib -L${libjpeg: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