autobuild: fix ctdb build of samba-ctdb target after switch to waf.
authorMichael Adam <obnox@samba.org>
Fri, 20 Jun 2014 19:31:26 +0000 (21:31 +0200)
committerMichael Adam <obnox@samba.org>
Sat, 21 Jun 2014 00:05:38 +0000 (02:05 +0200)
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Sat Jun 21 02:05:38 CEST 2014 on sn-devel-104

script/autobuild.py

index 9ebdf2bc27cd8fed45a158b9a59f899ef865592c..786286ba7980473de783bfa3c86f6478ee576182 100755 (executable)
@@ -59,8 +59,7 @@ tasks = {
                      ("tdb-install", "cd lib/tdb && make install", "text/plain"),
 
                      # build and install ctdb:
-                     ("ctdb-autogen", "cd ./ctdb && ./autogen.sh", "text/plain"),
-                     ("ctdb-configure", "cd ./ctdb && CFLAGS=-I${PREFIX_DIR}/include LDFLAGS=-L${PREFIX_DIR}/lib ./configure ${PREFIX} --enable-socket-wrapper --with-included-tdb=no", "text/plain"),
+                     ("ctdb-configure", "cd ./ctdb && PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH} ./configure ${PREFIX} --bundled-libraries=!tdb", "text/plain"),
                      ("ctdb-make", "cd ./ctdb && make all", "text/plain"),
                      ("ctdb-install", "cd ./ctdb && make install", "text/plain"),
                      ("ctdb-header-ls", "ls ${PREFIX_DIR}/include/ctdb.h", "text/plain"),