sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s3:wscript: only build ctdb_dummy.c if we have no cluster support

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Stefan Metzmacher 2014-01-21 15:26:28 +01:00 committed by Michael Adam
parent 91e56961fd
commit e93b85dbd8
7 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/lib/ctdb_conn.c
View File

@ -21,8 +21,6 @@
#include "lib/util/tevent_unix.h" #include "lib/util/tevent_unix.h"
#include "ctdb_conn.h" #include "ctdb_conn.h"
#ifdef CLUSTER_SUPPORT
#include <tdb.h> #include <tdb.h>
#ifdef HAVE_CTDB_PROTOCOL_H #ifdef HAVE_CTDB_PROTOCOL_H
@ -553,5 +551,3 @@ int ctdb_msg_read_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
*pmsg_len = msg->datalen; *pmsg_len = msg->datalen;
return 0; return 0;
} }
#endif

4
source3/lib/ctdb_dummy.c
View File

@ -25,8 +25,6 @@
#include "lib/dbwrap/dbwrap_ctdb.h" #include "lib/dbwrap/dbwrap_ctdb.h"
#include "torture/proto.h" #include "torture/proto.h"
#ifndef CLUSTER_SUPPORT
NTSTATUS ctdbd_probe(void) NTSTATUS ctdbd_probe(void)
{ {
return NT_STATUS_NOT_IMPLEMENTED; return NT_STATUS_NOT_IMPLEMENTED;
@ -180,5 +178,3 @@ bool run_ctdb_conn(int dummy)
{ {
return true; return true;
} }
#endif

4
source3/lib/ctdbd_conn.c
View File

@ -23,8 +23,6 @@
#include "serverid.h" #include "serverid.h"
#include "ctdbd_conn.h" #include "ctdbd_conn.h"
#ifdef CLUSTER_SUPPORT
#include "ctdb_packet.h" #include "ctdb_packet.h"
#include "messages.h" #include "messages.h"
@ -1885,5 +1883,3 @@ NTSTATUS ctdbd_probe(void)
return status; return status;
} }
#endif

4
source3/lib/dbwrap/dbwrap_ctdb.c
View File

@ -27,8 +27,6 @@
#include "dbwrap/dbwrap_rbt.h" #include "dbwrap/dbwrap_rbt.h"
#include "lib/param/param.h" #include "lib/param/param.h"
#ifdef CLUSTER_SUPPORT
/* /*
* It is not possible to include ctdb.h and tdb_compat.h (included via * It is not possible to include ctdb.h and tdb_compat.h (included via
* some other include above) without warnings. This fixes those * some other include above) without warnings. This fixes those
@ -1709,5 +1707,3 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
return result; return result;
} }
#endif

4
source3/lib/messages_ctdbd.c
View File

@ -21,8 +21,6 @@
#include "messages.h" #include "messages.h"
#include "util_tdb.h" #include "util_tdb.h"
#ifdef CLUSTER_SUPPORT
/* /*
* It is not possible to include ctdb.h and tdb_compat.h (included via * It is not possible to include ctdb.h and tdb_compat.h (included via
* some other include above) without warnings. This fixes those * some other include above) without warnings. This fixes those
@ -168,5 +166,3 @@ NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx,
*presult = result; *presult = result;
return NT_STATUS_OK; return NT_STATUS_OK;
} }
#endif

4
source3/torture/test_ctdbconn.c
View File

@ -20,8 +20,6 @@
#include "includes.h" #include "includes.h"
#include "torture/proto.h" #include "torture/proto.h"
#ifdef CLUSTER_SUPPORT
#include "ctdb_conn.h" #include "ctdb_conn.h"
#include "ctdbd_conn.h" #include "ctdbd_conn.h"
#include "lib/util/tevent_unix.h" #include "lib/util/tevent_unix.h"
@ -243,5 +241,3 @@ bool run_ctdb_conn(int dummy)
TALLOC_FREE(ev); TALLOC_FREE(ev);
return (ret == 0); return (ret == 0);
} }
#endif

24
source3/wscript_build
View File

@ -270,22 +270,34 @@ bld.SAMBA3_SUBSYSTEM('samba3util',
lib/sock_exec.c''', lib/sock_exec.c''',
deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash') deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash')
bld.SAMBA3_LIBRARY('samba-cluster-support', if bld.CONFIG_GET("CTDB_CFLAGS"):
source=''' SAMBA_CLUSTER_SUPPORT_SOURCES='''
lib/cluster_support.c lib/cluster_support.c
lib/ctdb_dummy.c
lib/dbwrap/dbwrap_ctdb.c lib/dbwrap/dbwrap_ctdb.c
lib/messages_ctdbd.c lib/messages_ctdbd.c
lib/ctdb_packet.c lib/ctdb_packet.c
lib/ctdbd_conn.c lib/ctdbd_conn.c
lib/ctdb_conn.c lib/ctdb_conn.c
torture/test_ctdbconn.c torture/test_ctdbconn.c
''', '''
deps=''' SAMBA_CLUSTER_SUPPORT_DEPS='''
talloc talloc
tevent tevent
tdb tdb
''', '''
else:
SAMBA_CLUSTER_SUPPORT_SOURCES='''
lib/cluster_support.c
lib/ctdb_dummy.c
'''
SAMBA_CLUSTER_SUPPORT_DEPS='''
talloc
tevent
'''
bld.SAMBA3_LIBRARY('samba-cluster-support',
source=SAMBA_CLUSTER_SUPPORT_SOURCES,
deps=SAMBA_CLUSTER_SUPPORT_DEPS,
cflags=bld.CONFIG_GET("CTDB_CFLAGS"), cflags=bld.CONFIG_GET("CTDB_CFLAGS"),
allow_undefined_symbols=True, allow_undefined_symbols=True,
private_library=True) private_library=True)