Merge remote-tracking branch 'origin/master' into erp5-cluster

component/gtk-2/buildout.cfg

@@ -12,6 +12,7 @@ extends =
   ../libpng/buildout.cfg
   ../libtiff/buildout.cfg
   ../libtool/buildout.cfg
+  ../m4/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../xorg/buildout.cfg
@@ -42,6 +43,7 @@ configure-options =
   --enable-fc
   --disable-lto
 environment =
+  M4=${m4:location}/bin/m4
   PATH=${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CPPFLAGS=-I${zlib:location}/include

component/tesseract/buildout.cfg

@@ -38,6 +38,8 @@ environment =
   LIBLEPT_HEADERSDIR=${leptonica:location}/include
   CPPFLAGS=-I${leptonica:location}/include
   LDFLAGS =-L${leptonica:location}/lib -Wl,-rpath=${leptonica:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+make-options =
+  LIBTOOL=${libtool:location}/bin/libtool
 
 [tesseract-eng-traineddata]
 recipe = hexagonit.recipe.download

stack/slapos.cfg

@@ -100,7 +100,7 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.7.1-dev-SlapOS-004
+zc.buildout = 1.7.1-dev-SlapOS-005
 # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
 zc.recipe.egg = 1.3.2nxd001
 # Use own version of h.r.download to be able to open xz-like archives