diff options
| author | Ira Cooper <ira@samba.org> | 2016-07-26 11:44:47 -0400 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2016-08-10 11:24:38 +0200 |
| commit | 3688305421febfe7cdd7c5723d8d333e7f91a926 (patch) | |
| tree | 7e773a98f39f1cdafba221a4c0fdb90e3e01444c | |
| parent | a99060836d5687d6b3060f0d00f86d2c53331e60 (diff) | |
| download | samba-3688305421febfe7cdd7c5723d8d333e7f91a926.tar.gz | |
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@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
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12133
(cherry picked from commit 14f29c4f560f1b3942245a6fa43924a8ce45d99d)
| -rw-r--r-- | source3/modules/wscript_build | 1 | ||||
| -rw-r--r-- | source3/wscript | 15 |
2 files changed, 12 insertions, 4 deletions
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build index 2d42a82b9fa..a5d84075872 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 fe3f40fe53a..5ce1b77e23b 100644 --- a/source3/wscript +++ b/source3/wscript @@ -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') |