From: Michael Adam Date: Fri, 20 Jun 2014 19:31:26 +0000 (+0200) Subject: autobuild: fix ctdb build of samba-ctdb target after switch to waf. X-Git-Tag: tdb-1.3.1~933 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=cef718c39f1bfbe72bee65db0fb1f680f887fbf0;p=bbaumbach%2Fsamba-autobuild%2F.git autobuild: fix ctdb build of samba-ctdb target after switch to waf. Signed-off-by: Michael Adam Reviewed-by: Andrew Bartlett Autobuild-User(master): Michael Adam Autobuild-Date(master): Sat Jun 21 02:05:38 CEST 2014 on sn-devel-104 --- diff --git a/script/autobuild.py b/script/autobuild.py index 9ebdf2bc27c..786286ba798 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -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"),