diff options
| -rw-r--r-- | source3/lib/cluster_support.c | 18 | ||||
| -rw-r--r-- | source3/lib/ctdb_conn.c | 4 | ||||
| -rw-r--r-- | source3/torture/test_ctdbconn.c | 4 | ||||
| -rw-r--r-- | source3/wscript | 82 |
4 files changed, 2 insertions, 106 deletions
diff --git a/source3/lib/cluster_support.c b/source3/lib/cluster_support.c index afe2260917..6a5f91d1d3 100644 --- a/source3/lib/cluster_support.c +++ b/source3/lib/cluster_support.c @@ -20,18 +20,11 @@ #include <tdb.h> #include "cluster_support.h" -#ifdef HAVE_CTDB_H +#ifdef CLUSTER_SUPPORT #include <ctdb.h> -#define CLUSTER_SUPPORT 1 -#endif - -#ifdef HAVE_CTDB_PROTOCOL_H #include <ctdb_protocol.h> -#else -#ifdef HAVE_CTDB_PRIVATE_H #include <ctdb_private.h> #endif -#endif bool cluster_support_available(void) { @@ -53,15 +46,6 @@ const char *cluster_support_features(void) #else " NONE\n" #endif -#ifdef HAVE_CTDB_H - _LINE_DEF(HAVE_CTDB_H) -#endif -#ifdef HAVE_CTDB_PRIVATE_H - _LINE_DEF(HAVE_CTDB_PRIVATE_H) -#endif -#ifdef HAVE_CTDB_PROTOCOL_H - _LINE_DEF(HAVE_CTDB_PROTOCOL_H) -#endif #ifdef CTDB_SOCKET _LINE_STR(CTDB_SOCKET) #endif diff --git a/source3/lib/ctdb_conn.c b/source3/lib/ctdb_conn.c index 09965118d5..1bba8e7e82 100644 --- a/source3/lib/ctdb_conn.c +++ b/source3/lib/ctdb_conn.c @@ -23,11 +23,7 @@ #include <tdb.h> -#ifdef HAVE_CTDB_PROTOCOL_H #include <ctdb_protocol.h> -#else -#include <ctdb_private.h> -#endif #include "lib/async_req/async_sock.h" diff --git a/source3/torture/test_ctdbconn.c b/source3/torture/test_ctdbconn.c index ff45a022d3..1f80cff5fd 100644 --- a/source3/torture/test_ctdbconn.c +++ b/source3/torture/test_ctdbconn.c @@ -25,11 +25,7 @@ #include "lib/util/tevent_unix.h" #include "tdb.h" -#ifdef HAVE_CTDB_PROTOCOL_H #include "ctdb_protocol.h" -#else -#include "ctdb_private.h" -#endif #include "messages.h" 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: |