sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

buildscripts: Fix the regression with --without-acl-support.

Browse Source 
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@samba.org>
Reviewed-by: Steve French <sfrench@samba.org>
Tested-by: Steve French <sfrench@samba.org>

Autobuild-User(master): Ira Cooper <ira@samba.org>
Autobuild-Date(master): Mon Aug  8 21:27:46 CEST 2016 on sn-devel-144
This commit is contained in:
Ira Cooper 2016-07-26 11:44:47 -04:00
parent 38bb993657
commit 14f29c4f56
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/modules/wscript_build
View File

@ -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',

15
source3/wscript
View File

@ -1579,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',
@ -1589,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')