diff options
| author | Jeroen Dekkers <jeroen@dekkers.ch> | 2013-09-09 00:42:39 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-07-15 12:46:13 +0200 |
| commit | 06c993eda6237bbb4df0e553abd7fbca6ba26559 (patch) | |
| tree | 5306a762ea63f62a705ff8bf972d7070bbf931e6 | |
| parent | c638eeed45081de2194771fd9dfc449cd188ea41 (diff) | |
| download | samba-06c993eda6237bbb4df0e553abd7fbca6ba26559.tar.gz | |
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
(cherry picked from commit 0af09f0179c024099e0776d3794f4b3d7fb3f6f6)
| -rwxr-xr-x | lib/ldb/wscript | 8 | ||||
| -rw-r--r-- | source4/utils/oLschema2ldif.c | 1 | ||||
| -rw-r--r-- | source4/utils/wscript_build | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/lib/ldb/wscript b/lib/ldb/wscript index f5647b1a59..071038cae9 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 be86daafb7..bcdf570977 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 a5217b3c61..046e2372fd 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' ) |