[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  0af09f0 ldb: Do not build libldb-cmdline when using system ldb.
      from  b8100af gencache: Avoid a duplicate call to string_term_tdb_data

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0af09f0179c024099e0776d3794f4b3d7fb3f6f6
Author: Jeroen Dekkers <jeroen at dekkers.ch>
Date:   Mon Sep 9 00:42:39 2013 +0200

    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>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Tue Sep 10 12:52:26 CEST 2013 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 lib/ldb/wscript               |    8 ++++----
 source4/utils/oLschema2ldif.c |    1 -
 source4/utils/wscript_build   |    2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

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


-- 
Samba Shared Repository