[PATCH] Do not build libldb-cmdline when using system ldb

[Jeroen Dekkers]

When working on the Debian packaging I looked at the dependencies
between samba libraries and noticed that libldb-cmdline was being
installed but not used by anything. The reason it was originally
installed was that oLschema2ldif used to use libldb-cmdline
(6e762f90). oLschema2ldif was already converted to popt however
(6199ae47), but removing the include and linking of ldb-cmdline was
forgotten.

The attached patch cleans up the leftover include and linking and does
not build libldb-cmdline anymore when the system ldb is used.

Kind regards,

Jeroen Dekkers
-------------- next part --------------
From 4060a6158ba839d328674e75f86ed4122055196c Mon Sep 17 00:00:00 2001
From: Jeroen Dekkers <jeroen at dekkers.ch>
Date: Mon, 9 Sep 2013 00:42:39 +0200
Subject: [PATCH] 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 at dekkers.ch>
---
 lib/ldb/wscript               | 8 ++++----
 source4/utils/oLschema2ldif.c | 1 -
 source4/utils/wscript_build   | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index f5647b1..071038c 100755
--- 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 be86daa..bcdf570 100644
--- 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 a5217b3..046e237 100644
--- 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'
 	)
 
-- 
1.8.4.rc3