diff options
| author | Matthieu Patou <mat@matws.net> | 2012-02-07 10:46:43 -0800 |
|---|---|---|
| committer | Matthieu Patou <mat@samba.org> | 2012-02-10 23:27:29 +0100 |
| commit | 474c02acac3d5c286acda7290b359db91e66d6ef (patch) | |
| tree | fb084cfdb3884ec171c30bffee32b257cdf203c6 | |
| parent | 05036fab0a9847219c73c0abd931a39fba0bccfd (diff) | |
| download | samba-474c02acac3d5c286acda7290b359db91e66d6ef.tar.gz samba-474c02acac3d5c286acda7290b359db91e66d6ef.tar.bz2 samba-474c02acac3d5c286acda7290b359db91e66d6ef.zip | |
s3-waf: add dependency on talloc or it won't build if talloc.h is not in the default include path
The problem occurs only if talloc, tdb and ldb are used as system
libraries and talloc is not installed in a default.
Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Fri Feb 10 23:27:29 CET 2012 on sn-devel-104
| -rwxr-xr-x | source3/rpc_server/wscript_build | 3 | ||||
| -rwxr-xr-x | source3/wscript_build | 12 | ||||
| -rw-r--r-- | source4/ntvfs/unixuid/wscript_build | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build index a0829fecac..57c76a2817 100755 --- a/source3/rpc_server/wscript_build +++ b/source3/rpc_server/wscript_build @@ -26,7 +26,8 @@ bld.SAMBA3_SUBSYSTEM('rpc', vars=locals()) bld.SAMBA3_SUBSYSTEM('RPC_CONFIG', - source='rpc_config.c') + source='rpc_config.c', + deps='talloc') bld.SAMBA3_SUBSYSTEM('RPC_NCACN_NP', source='rpc_ncacn_np.c rpc_handles.c rpc_contexts.c', diff --git a/source3/wscript_build b/source3/wscript_build index cb16ef2262..1e41953174 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -734,14 +734,16 @@ bld.SAMBA3_LIBRARY('pdb', vars=locals()) bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX', - source=SERVER_MUTEX_SRC) + source=SERVER_MUTEX_SRC, + deps='talloc') bld.SAMBA3_SUBSYSTEM('PARAM_UTIL', - source=PARAM_UTIL_SRC) + source=PARAM_UTIL_SRC, + deps='talloc') bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX', source='param/loadparm_ctx.c', - deps='''s3_param_h param''', + deps='''talloc s3_param_h param''', vars=locals()) bld.SAMBA_GENERATOR('param/param_global_h', @@ -837,7 +839,8 @@ bld.SAMBA3_SUBSYSTEM('samba3core', vars=locals()) bld.SAMBA3_LIBRARY('smbd_shim', - source='''lib/smbd_shim.c''', + source='''lib/smbd_shim.c''', + deps='talloc', private_library=True) bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP', @@ -1084,6 +1087,7 @@ bld.SAMBA3_LIBRARY('trusts_util', bld.SAMBA3_SUBSYSTEM('tdb-wrap3', source='lib/util_tdb.c', + deps='talloc', vars=locals()) bld.SAMBA3_LIBRARY('dbwrap', diff --git a/source4/ntvfs/unixuid/wscript_build b/source4/ntvfs/unixuid/wscript_build index 3a7570956b..56fd42d1af 100644 --- a/source4/ntvfs/unixuid/wscript_build +++ b/source4/ntvfs/unixuid/wscript_build @@ -4,6 +4,6 @@ bld.SAMBA_MODULE('ntvfs_unixuid', source='vfs_unixuid.c', subsystem='ntvfs', init_function='ntvfs_unixuid_init', - deps='auth_unix_token' + deps='auth_unix_token talloc' ) |