[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  acb8182 s3:wscript_build: fix the build using dmapi and fam together
      from  b6c9d9a gpfswrap: Use gpfs.h instead of gpfs_fcntl.h

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit acb8182325ff44649bdbab5616c615199292f820
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jul 8 07:43:20 2015 +0200

    s3:wscript_build: fix the build using dmapi and fam together
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Wed Jul  8 11:54:24 CEST 2015 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/wscript_build | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript_build b/source3/wscript_build
index 8ac8eec..ace4b99 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -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',


-- 
Samba Shared Repository