[Erp5-report] r41108 kazuhiko - /erp5/trunk/buildout/software-profiles/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Dec  3 17:07:43 2010
New Revision: 41108

URL: http://svn.erp5.org?rev=41108&view=rev
Log:
* specify zlib location by -L so that configure script can find.
* use CPPFLAGS not CFLAGS.

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

Modified: erp5/trunk/buildout/software-profiles/file.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/file.cfg?rev=41108&r1=41107&r2=41108&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/file.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/file.cfg [utf8] Fri Dec  3 17:07:43 2010
@@ -9,5 +9,5 @@ recipe = hexagonit.recipe.cmmi
 url = ftp://ftp.astron.com/pub/file/file-5.04.tar.gz
 md5sum = accade81ff1cc774904b47c72c8aeea0
 environment =
-  CFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath -Wl,${zlib:location}/lib
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib

Modified: erp5/trunk/buildout/software-profiles/imagemagick.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/imagemagick.cfg?rev=41108&r1=41107&r2=41108&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] Fri Dec  3 17:07:43 2010
@@ -45,4 +45,4 @@ patches =
 environment =
   PATH=${freetype:location}/bin:${ghostscript: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
+  LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -L${zlib:location}/lib -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