summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-11-30 16:34:52 +0100
committerGünther Deschner <gd@samba.org>2011-11-30 18:37:29 +0100
commit9c4d49863a80ebe6dedd8faeb4bf41270f7ba685 (patch)
tree93b90ec6119f099dcf3f543c361570141be35217
parentde553b52f2bacf54b57b56216fbb91f9108026be (diff)
downloadsamba-9c4d49863a80ebe6dedd8faeb4bf41270f7ba685.tar.gz
samba-9c4d49863a80ebe6dedd8faeb4bf41270f7ba685.tar.bz2
samba-9c4d49863a80ebe6dedd8faeb4bf41270f7ba685.zip
s3-waf: fix the build with CTDB_CONTROL_CHECK_SRVIDS.
Volker, Michael, please check. Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Wed Nov 30 18:37:29 CET 2011 on sn-devel-104
-rw-r--r--source3/wscript29
1 files changed, 29 insertions, 0 deletions
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 <talloc.h>
+ #include <tdb.h>
+ #include <ctdb.h>
+ #include <ctdb_private.h>
+
+ 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);