Merge branch 'master' into '1.0'

New Release Candidate

Latest version with working tests for slapos.

See merge request !17

component/cyrus-sasl/buildout.cfg

@@ -2,6 +2,7 @@
 parts =
   cyrus-sasl
 extends =
+  ../autoconf/buildout.cfg
   ../automake/buildout.cfg
   ../gdbm/buildout.cfg
   ../libtool/buildout.cfg
@@ -34,6 +35,6 @@ make-options =
   -j1
 
 environment =
-  PATH=${m4:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${m4:location}/bin:%(PATH)s
   CPPFLAGS=-fPIC -I${zlib:location}/include -I${gdbm:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib