summaryrefslogtreecommitdiffstats
path: root/source3/wscript
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2014-10-10 14:25:34 +1100
committerAmitay Isaacs <amitay@samba.org>2014-10-28 05:42:04 +0100
commite67c4b977a52d1744f4da8296bbcd7c213cbe92a (patch)
treeb5a4bf9397c28f3848d8460b8fced130e38cb572 /source3/wscript
parent0d5ecaa2e38b55e981cb2770a945d14ab1d98589 (diff)
downloadsamba-e67c4b977a52d1744f4da8296bbcd7c213cbe92a.tar.gz
samba-e67c4b977a52d1744f4da8296bbcd7c213cbe92a.tar.xz
samba-e67c4b977a52d1744f4da8296bbcd7c213cbe92a.zip
build: Remove configure checks for ctdb headers
Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/wscript')
-rw-r--r--source3/wscript82
1 files changed, 1 insertions, 81 deletions
diff --git a/source3/wscript b/source3/wscript
index bac488cf1a..01c9c35142 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1488,89 +1488,9 @@ main() {
if not conf.env.USING_SYSTEM_TALLOC:
includes = includes + ' ' + srcdir + '/lib/talloc'
- ok = conf.CHECK_CODE('''
- #define NO_CONFIG_H
- #include "replace.h"
- #include "system/wait.h"
- #include "system/network.h"
- #define private #error __USED_RESERVED_WORD_private__
- #include <talloc.h>
- #include <tdb.h>
- #include <ctdb.h>
-
- int main(void)
- {
- return 0;
- }
- ''',
- 'HAVE_CTDB_CHECK_CODE',
- addmain=False,
- includes=includes,
- msg='Checking for header ctdb.h')
- if ok:
- CTDB_CFLAGS += ' -DHAVE_CTDB_H=1'
- else:
- have_cluster_support = False
- ctdb_broken = "ctdb.h is required for cluster support"
-
- conf.CONFIG_RESET('HAVE_CTDB_CHECK_CODE')
- if have_cluster_support:
- ok = conf.CHECK_CODE('''
- #define NO_CONFIG_H
- #include "replace.h"
- #include "system/wait.h"
- #include "system/network.h"
- #define private #error __USED_RESERVED_WORD_private__
- #include <talloc.h>
- #include <tdb.h>
- #include <ctdb.h>
- #include <ctdb_private.h>
-
- int main(void)
- {
- return 0;
- }
- ''',
- 'HAVE_CTDB_CHECK_CODE',
- addmain=False,
- includes=includes,
- msg='Checking for header ctdb_private.h')
- if ok:
- CTDB_CFLAGS += ' -DHAVE_CTDB_PRIVATE_H=1'
- else:
- have_cluster_support = False
- ctdb_broken = "ctdb_private.h is required for cluster support"
-
- conf.CONFIG_RESET('HAVE_CTDB_CHECK_CODE')
- if have_cluster_support:
- ok = conf.CHECK_CODE('''
- #define NO_CONFIG_H
- #include "replace.h"
- #include "system/wait.h"
- #include "system/network.h"
- #define private #error __USED_RESERVED_WORD_private__
- #include <talloc.h>
- #include <tdb.h>
- #include <ctdb.h>
- #include <ctdb_protocol.h>
-
- int main(void)
- {
- return 0;
- }
- ''',
- 'HAVE_CTDB_CHECK_CODE',
- addmain=False,
- includes=includes,
- msg='Checking for header ctdb_protocol.h')
- if ok:
- CTDB_CFLAGS += ' -DHAVE_CTDB_PROTOCOL_H=1'
-
- conf.CONFIG_RESET('HAVE_CTDB_CHECK_CODE')
- conf.undefine('HAVE_CTDB_CHECK_CODE')
if have_cluster_support:
Logs.info("building with cluster support")
- conf.env['CTDB_CFLAGS'] = CTDB_CFLAGS
+ conf.env['CTDB_CFLAGS'] = '-DCLUSTER_SUPPORT=1'
conf.env['CTDB_INCLUDE'] = CTDB_INCLUDE
else:
if Options.options.with_cluster_support == False: