sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3:wscript_build: fix the build using dmapi and fam together

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Wed Jul  8 11:54:24 CEST 2015 on sn-devel-104
This commit is contained in:
Stefan Metzmacher 2015-07-08 07:43:20 +02:00 committed by Michael Adam
parent b6c9d9a59e
commit acb8182325
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/wscript_build
View File

@ -510,12 +510,14 @@ bld.SAMBA3_SUBSYSTEM('sysquotas',
deps='samba3-util samba-util')
NOTIFY_SOURCES=''
NOTIFY_DEPS=''
if bld.CONFIG_SET("HAVE_INOTIFY"):
NOTIFY_SOURCES += ' smbd/notify_inotify.c'
if bld.CONFIG_SET('SAMBA_FAM_LIBS'):
NOTIFY_SOURCES += ' smbd/notify_fam.c'
NOTIFY_DEPS += ' ' + bld.CONFIG_GET('SAMBA_FAM_LIBS')
bld.SAMBA3_LIBRARY('smbd_base',
source='''
@ -637,9 +639,9 @@ bld.SAMBA3_LIBRARY('smbd_base',
netapi
NDR_IOCTL
notifyd
''' + bld.env['dmapi_lib']
+ (bld.CONFIG_GET('SAMBA_FAM_LIBS')
if bld.CONFIG_SET('SAMBA_FAM_LIBS') else ''),
''' +
bld.env['dmapi_lib'] +
NOTIFY_DEPS,
private_library=True)
bld.SAMBA3_SUBSYSTEM('LOCKING',