sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

ntdb: make --disable-ntdb work properly.

Browse Source 
As per bug #9024, make --disable-ntdb work again.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Autobuild-User(master): Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date(master): Wed Jul  4 08:11:33 CEST 2012 on sn-devel-104
This commit is contained in:
Rusty Russell 2012-07-04 13:51:07 +09:30
parent 6449022d3e
commit 74bf0c6ec6
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/dbwrap/dbwrap_local_open.c
View File

@ -22,7 +22,9 @@
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_tdb.h"
#include "tdb.h"
#ifndef DISABLE_NTDB
#include "lib/util/util_ntdb.h"
#endif
#include "lib/param/param.h"
#include "system/filesys.h"
#include "ccan/str/str.h"

13
lib/util/wscript_build
View File

@ -45,12 +45,13 @@ bld.SAMBA_LIBRARY('util_tdb',
private_library=True
)
bld.SAMBA_LIBRARY('util_ntdb',
source='util_ntdb.c',
local_include=False,
public_deps='ntdb talloc samba-util samba-hostconfig',
private_library=True
)
if not bld.env.disable_ntdb:
bld.SAMBA_LIBRARY('util_ntdb',
source='util_ntdb.c',
local_include=False,
public_deps='ntdb talloc samba-util samba-hostconfig',
private_library=True
)
bld.SAMBA_LIBRARY('tevent-util',
source='tevent_unix.c tevent_ntstatus.c tevent_werror.c',

2
wscript
View File

@ -132,6 +132,8 @@ def configure(conf):
conf.env.disable_ntdb = getattr(Options.options, 'disable_ntdb', False)
if not Options.options.disable_ntdb:
conf.RECURSE('lib/ntdb')
else:
conf.DEFINE('DISABLE_NTDB', 1)
conf.RECURSE('lib/zlib')
conf.RECURSE('lib/util/charset')
conf.RECURSE('source4/auth')