[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Tue Jul 26 10:22:01 MDT 2011
The branch, master has been updated
via 3ce1894 s3-build: Only define ldb3 when not in standalone build.
via fc94f52 shares: Remove dependencies on share modules.
from 14d5983 s4:samba-tool: ldapcmp needs CredentialsOptionsDouble
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3ce1894ff8befab199f8754f30331fa34aeb6530
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jul 26 15:21:02 2011 +0200
s3-build: Only define ldb3 when not in standalone build.
This prevents errors about it by 'make SYMBOLCHECK=1' if there is a
system ldb present.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Tue Jul 26 18:21:48 CEST 2011 on sn-devel-104
commit fc94f5238be46db85c9bb7fb4fcbd617a28769ee
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jul 26 13:32:39 2011 +0200
shares: Remove dependencies on share modules.
The build system will already pull these in - if necessary.
-----------------------------------------------------------------------
Summary of changes:
source3/wscript_build | 7 +++----
source4/param/wscript_build | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript_build b/source3/wscript_build
index 40a1d9b..50b21e9 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1052,10 +1052,6 @@ bld.SAMBA3_LIBRARY('CHARSET3',
deps='samba-util util_str',
private_library=True)
-bld.SAMBA3_SUBSYSTEM('ldb3',
- source='lib/ldb_compat.c',
- deps='samba-util')
-
bld.SAMBA3_SUBSYSTEM('errors3',
source='libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c',
deps='errors')
@@ -1411,6 +1407,9 @@ bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
if not bld.env.toplevel_build:
bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='popt_samba3')
+ bld.SAMBA3_SUBSYSTEM('ldb3',
+ source='lib/ldb_compat.c',
+ deps='samba-util')
bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3')
bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT')
diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index 9a45512..a354637 100644
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -73,6 +73,6 @@ bld.SAMBA_SUBSYSTEM('pyparam_util',
bld.SAMBA_LIBRARY('shares',
source=[],
- deps='share share_classic share_ldb',
+ deps='share',
grouping_library=True,
private_library=True)
--
Samba Shared Repository
More information about the samba-cvs
mailing list