From 9c4d49863a80ebe6dedd8faeb4bf41270f7ba685 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 30 Nov 2011 16:34:52 +0100 Subject: s3-waf: fix the build with CTDB_CONTROL_CHECK_SRVIDS. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Volker, Michael, please check. Guenther Autobuild-User: Günther Deschner Autobuild-Date: Wed Nov 30 18:37:29 CET 2011 on sn-devel-104 --- source3/wscript | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'source3') diff --git a/source3/wscript b/source3/wscript index 25140486f9..4dc4560fc1 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1545,6 +1545,35 @@ main() { includes=includes, msg='Checking for ctdb ipv6 support') + if have_cluster_support: + conf.CHECK_CODE(''' + #define NO_CONFIG_H + #include "replace.h" + #include "system/wait.h" + #include "system/network.h" + #include + #include + #include + #include + + int main(void) + { + int i = (int)CTDB_CONTROL_CHECK_SRVIDS; + return 0; + } + ''', + 'HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL', + addmain=False, + includes=includes, + msg='Checking for CHECK_SRVIDS control') + + if not conf.CONFIG_SET('HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL'): + if not Options.options.enable_old_ctdb: + have_cluster_support = False + ctdb_broken = "CHECK_SRVIDS control missing" + else: + Logs.warn("ignoring missing CHECK_SRVIDS control (--enable-old-ctdb)") + if have_cluster_support: Logs.info("building with cluster support") conf.DEFINE('CLUSTER_SUPPORT', 1); -- cgit