ldb: Do not build libldb-cmdline when using system ldb.

Cleanup leftover include and linking of libldb-cmdline in
oLschema2ldif. Do not build libldb-cmdline anymore when using the
system ldb, oLschema2ldif was the only reason for building
libldb-cmdline.

Signed-off-by: Jeroen Dekkers <jeroen@dekkers.ch>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Sep 10 12:52:26 CEST 2013 on sn-devel-104

diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index f5647b1a59fc2bec0de21c88c887987c499eac87..071038cae994fc48329ab11e6460f3978b28a8f3 100755 (executable)
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -257,10 +257,10 @@ def build(bld):
         bld.SAMBA_BINARY('ldbdump', 'tools/ldbdump.c', deps='ldb-cmdline ldb',
                          install=False)
 
-    bld.SAMBA_LIBRARY('ldb-cmdline',
-                      source='tools/ldbutil.c tools/cmdline.c',
-                      deps='ldb dl popt',
-                      private_library=True)
+        bld.SAMBA_LIBRARY('ldb-cmdline',
+                          source='tools/ldbutil.c tools/cmdline.c',
+                          deps='ldb dl popt',
+                          private_library=True)
 
 
 def test(ctx):

diff --git a/source4/utils/oLschema2ldif.c b/source4/utils/oLschema2ldif.c
index be86daafb7177215ed8ef8dfa74ffd2248a9fbcf..bcdf5709775b194c9098a95e2b8af6a997f496ee 100644 (file)
--- a/source4/utils/oLschema2ldif.c
+++ b/source4/utils/oLschema2ldif.c
@@ -33,7 +33,6 @@
 
 #include "includes.h"
 #include "ldb.h"
-#include "tools/cmdline.h"
 #include "dsdb/samdb/samdb.h"
 #include "../lib/crypto/sha256.h"
 #include "../librpc/gen_ndr/ndr_misc.h"

diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build
index a5217b3c61975720e10e3d7bffa46e6dd67f0104..046e2372fdfe99249e11ca789946c3bc1ed86413 100644 (file)
--- a/source4/utils/wscript_build
+++ b/source4/utils/wscript_build
@@ -14,6 +14,6 @@ bld.SAMBA_BINARY('ntlm_auth4',
 bld.SAMBA_BINARY('oLschema2ldif',
        source='oLschema2ldif.c',
        manpages='man/oLschema2ldif.1',
-       deps='ldb-cmdline samdb POPT_SAMBA'
+       deps='samdb POPT_SAMBA'
        )