diff options
author | Michael Adam <obnox@samba.org> | 2014-06-20 21:31:26 +0200 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2014-06-21 02:05:38 +0200 |
commit | cef718c39f1bfbe72bee65db0fb1f680f887fbf0 (patch) | |
tree | df325d0ef5d24a55767c9f13f75ae0ed6db0fbb2 /script/autobuild.py | |
parent | 43d9670605e26f118cec70b0a083bf7c655653d2 (diff) | |
download | samba-cef718c39f1bfbe72bee65db0fb1f680f887fbf0.tar.gz |
autobuild: fix ctdb build of samba-ctdb target after switch to waf.
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
Diffstat (limited to 'script/autobuild.py')
-rwxr-xr-x | script/autobuild.py | 3 |
1 files changed, 1 insertions, 2 deletions
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"), |