From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 4 Jul 2012 04:21:07 +0000 (+0930)
Subject: ntdb: make --disable-ntdb work properly.
X-Git-Tag: ldb-1.1.8~61
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=74bf0c6ec63955156f7acf673e2c5846bb8b212a;p=samba.git

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
---

diff --git a/lib/dbwrap/dbwrap_local_open.c b/lib/dbwrap/dbwrap_local_open.c
index bb0df485fbb..fb5f17ebabe 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 e601ecd4ed0..340cf12cd4f 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',
diff --git a/wscript b/wscript
index 1238eb6ae3a..727374dee2a 100755
--- a/wscript
+++ b/wscript
@@ -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')