diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-07-04 13:51:07 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-07-04 08:11:33 +0200 |
| commit | 74bf0c6ec63955156f7acf673e2c5846bb8b212a (patch) | |
| tree | 67da5e29d7164bc4cb4b46e544b552fa99b6d152 /lib | |
| parent | 6449022d3e05726879f9e268464ae89ce119103e (diff) | |
| download | samba-74bf0c6ec63955156f7acf673e2c5846bb8b212a.tar.gz samba-74bf0c6ec63955156f7acf673e2c5846bb8b212a.tar.bz2 samba-74bf0c6ec63955156f7acf673e2c5846bb8b212a.zip | |
ntdb: make --disable-ntdb work properly.
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dbwrap/dbwrap_local_open.c | 2 | ||||
| -rwxr-xr-x | lib/util/wscript_build | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lib/dbwrap/dbwrap_local_open.c b/lib/dbwrap/dbwrap_local_open.c index bb0df485fb..fb5f17ebab 100644 --- a/lib/dbwrap/dbwrap_local_open.c +++ b/lib/dbwrap/dbwrap_local_open.c @@ -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" diff --git a/lib/util/wscript_build b/lib/util/wscript_build index e601ecd4ed..340cf12cd4 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -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', |