* use CPPFLAGS instead of CFLAGS for specifying header locations.

* disable X11/OpenGL for libtiff and jasper.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41882 20353a03-c40f-0410-a6d1-a30d3c3de9de

buildout/software-profiles/fontconfig.cfg

@@ -18,5 +18,5 @@ configure-options =
   --with-expat=${libexpat:location}
   --with-freetype-config=${freetype:location}/bin/freetype-config
 environment =
-  CFLAGS=-I${zlib:location}/include
+  CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib

buildout/software-profiles/freetype.cfg

@@ -13,5 +13,5 @@ recipe = hexagonit.recipe.cmmi
 url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.4.tar.gz
 md5sum = 9273efacffb683483e58a9e113efae9f
 environment =
-  CFLAGS=-I${zlib:location}/include
+  CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib

buildout/software-profiles/glib.cfg

@@ -13,6 +13,6 @@ configure-options =
   --disable-xattr
   
 environment =
-  CFLAGS=-I${zlib:location}/include -I${gettext:location}/include
+  CPPFLAGS=-I${zlib:location}/include -I${gettext:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib
   PATH=${gettext:location}/bin:%(PATH)s

buildout/software-profiles/graphviz.cfg

@@ -52,5 +52,5 @@ configure-options =
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig
-  CFLAGS =-I${zlib:location}/include
-  LDFLAGS =-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib

buildout/software-profiles/jasper.cfg

@@ -10,7 +10,7 @@ url = http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip
 md5sum = a342b2b4495b3e1394e161eb5d85d754
 # jasper configure script is not executable by default
 configure-command =
-  /bin/sh ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-shared
+  /bin/sh ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-shared --disable-opengl
 environment =
-  CFLAGS=-I${libjpeg:location}/include
+  CPPFLAGS=-I${libjpeg:location}/include
   LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib

buildout/software-profiles/libtiff.cfg

@@ -11,7 +11,8 @@ parts =
 recipe = hexagonit.recipe.cmmi
 url = http://download.osgeo.org/libtiff/tiff-3.9.4.tar.gz
 md5sum = 2006c1bdd12644dbf02956955175afd6
-
+configure-options =
+  --without-x
 environment =
-  CFLAGS=-I${libjpeg:location}/include -I${jbigkit:location}/include -I${zlib:location}/include
+  CPPFLAGS=-I${libjpeg:location}/include -I${jbigkit:location}/include -I${zlib:location}/include
   LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib -L${jbigkit:location}/lib -Wl,-rpath -Wl,${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib