Merge branch 'erp5' into erp5-cluster

component/gnutls/buildout.cfg

@@ -4,6 +4,7 @@ extends =
   ../nettle/buildout.cfg
   ../ncurses/buildout.cfg
   ../readline/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 
 parts = gnutls
@@ -31,6 +32,6 @@ configure-options =
   --with-libgcrypt-prefix=${gcrypt:location}
   --disable-static
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gmp:location}/include -I${gcrypt:location}/include -I${gpg-error:location}/include -I${nettle:location}/include
   LDFLAGS=-lgcrypt -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${nettle:location}/lib -Wl,-rpath=${nettle:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
-

component/libsigc/buildout.cfg

 [buildout]
 extends =
   ../m4/buildout.cfg
+  ../xz-utils/buildout.cfg
 
 parts =
   libsigc
@@ -12,4 +13,4 @@ md5sum = 06a0569e8ba161d3428e7daa838682f8
 configure-options =
   --disable-documentation
 environment =
-  PATH=${m4:location}/bin:%(PATH)s
+  PATH=${m4:location}/bin:${xz-utils:location}/bin:%(PATH)s