[SCM] Samba Shared Repository - branch master updated

[Ira Cooper]

The branch, master has been updated
       via  14f29c4 buildscripts: Fix the regression with --without-acl-support.
       via  38bb993 source3/wscript: Add support for disabling vfs_cephfs
      from  a0e60e9 samba-tool/ldapcmp: ignore differences of whenChanged

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


- Log -----------------------------------------------------------------
commit 14f29c4f560f1b3942245a6fa43924a8ce45d99d
Author: Ira Cooper <ira at samba.org>
Date:   Tue Jul 26 11:44:47 2016 -0400

    buildscripts: Fix the regression with --without-acl-support.
    
    This will disable the vfs_glusterfs and vfs_cephfs modules if
    you provide --without-acl-support.
    
    In addition it makes compiling in POSIXACL_XATTR conditional
    on vfs_glusterfs or vfs_cephfs being built in.
    
    Signed-off-by: Ira Cooper <ira at samba.org>
    Reviewed-by: Steve French <sfrench at samba.org>
    Tested-by: Steve French <sfrench at samba.org>
    
    Autobuild-User(master): Ira Cooper <ira at samba.org>
    Autobuild-Date(master): Mon Aug  8 21:27:46 CEST 2016 on sn-devel-144

commit 38bb993657f8eb6c49899de0d741ed5186ca5022
Author: Ira Cooper <ira at samba.org>
Date:   Tue Jul 26 11:22:43 2016 -0400

    source3/wscript: Add support for disabling vfs_cephfs
    
    --enable-cephfs and --disable-cephfs both work now.
    
    --enable-cephfs is the default to match previous
    versions of Samba.
    
    Signed-off-by: Ira Cooper <ira at samba.org>
    Reviewed-by: Steve French <sfrench at samba.org>
    Tested-by: Steve French <sfrench at samba.org>

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

Summary of changes:
 source3/modules/wscript_build |  1 +
 source3/wscript               | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 2d42a82..a5d8407 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -6,6 +6,7 @@ bld.SAMBA3_SUBSYSTEM('NFS4_ACLS',
 
 bld.SAMBA3_SUBSYSTEM('POSIXACL_XATTR',
                  source='posixacl_xattr.c',
+                 enabled=(bld.SAMBA3_IS_ENABLED_MODULE('vfs_ceph') or bld.SAMBA3_IS_ENABLED_MODULE('vfs_glusterfs')),
                  deps='acl attr')
 
 bld.SAMBA3_LIBRARY('non_posix_acls',
diff --git a/source3/wscript b/source3/wscript
index 497b673..5ce1b77 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -69,6 +69,7 @@ def set_options(opt):
                    action="store", dest='libcephfs_dir', default=None)
 
     opt.SAMBA3_ADD_OPTION('glusterfs', with_name="enable", without_name="disable", default=True)
+    opt.SAMBA3_ADD_OPTION('cephfs', with_name="enable", without_name="disable", default=True)
 
     opt.add_option('--enable-vxfs',
                   help=("enable support for VxFS (default=no)"),
@@ -1578,8 +1579,12 @@ main() {
         conf.env['CPPPATH_CEPHFS'] = Options.options.libcephfs_dir + '/include'
         conf.env['LIBPATH_CEPHFS'] = Options.options.libcephfs_dir + '/lib'
 
-    if conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and conf.CHECK_LIB('cephfs'):
-        conf.DEFINE('HAVE_CEPH', '1')
+    if conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and conf.CHECK_LIB('cephfs', shlib=True) and Options.options.with_cephfs:
+        if Options.options.with_acl_support:
+            conf.DEFINE('HAVE_CEPH', '1')
+        else:
+            Logs.warn("ceph support disabled due to --without-acl-support")
+            conf.undefine('HAVE_CEPH')
 
     if Options.options.with_glusterfs:
         conf.CHECK_CFG(package='glusterfs-api', args='"glusterfs-api >= 4" --cflags --libs',
@@ -1588,9 +1593,12 @@ main() {
         conf.CHECK_LIB('gfapi', shlib=True)
 
         if conf.CONFIG_SET('HAVE_API_GLFS_H'):
-            conf.DEFINE('HAVE_GLUSTERFS', '1')
+            if Options.options.with_acl_support:
+                 conf.DEFINE('HAVE_GLUSTERFS', '1')
+            else:
+                Logs.warn("GlusterFS support disabled due to --without-acl-support")
+                conf.undefine('HAVE_GLUSTERFS')
         else:
-            conf.SET_TARGET_TYPE('gfapi', 'EMPTY')
             conf.undefine('HAVE_GLUSTERFS')
     else:
         conf.SET_TARGET_TYPE('gfapi', 'EMPTY')


-- 
Samba Shared Repository