summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-03 09:20:02 +0200
committerAndrew Bartlett <abartlet@samba.org>2011-07-03 09:20:02 +0200
commita3c9dd3d48a97bf7c1c7731f0e52b72cc019fb1b (patch)
treebffa541130878e967df8cd3d7ab2155aff761ff1 /source3/modules
parent7e52436673402095811eb081a0c036427fd31f84 (diff)
downloadsamba-a3c9dd3d48a97bf7c1c7731f0e52b72cc019fb1b.tar.gz
samba-a3c9dd3d48a97bf7c1c7731f0e52b72cc019fb1b.tar.bz2
samba-a3c9dd3d48a97bf7c1c7731f0e52b72cc019fb1b.zip
s3-build Prepare to require fully defined modules
This specifies some more deps for our modules, and ensures that the subsystem that it links against is in fact a library, which will avoid issues with introducing duplicate symbols. Andrew Bartlett
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/wscript_build7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 920b7c1971..2ae7a7e33a 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -62,7 +62,7 @@ bld.SAMBA3_SUBSYSTEM('VFS_AIXACL_UTIL',
bld.SAMBA3_SUBSYSTEM('vfs',
source='',
- deps='',
+ deps='smbd_base',
vars=locals())
bld.SAMBA3_MODULE('vfs_default',
@@ -345,7 +345,8 @@ bld.SAMBA3_MODULE('vfs_aio_fork',
deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_fork'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_fork'))
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_fork'),
+ allow_undefined_symbols=True)
bld.SAMBA3_MODULE('vfs_preopen',
subsystem='vfs',
@@ -450,7 +451,7 @@ PERFCOUNT_TEST_SRC = 'perfcount_test.c'
bld.SAMBA3_SUBSYSTEM('perfcount',
source='',
- vars=locals())
+ deps='smbd_base')
bld.SAMBA3_MODULE('perfcount_onefs',
subsystem='perfcount',