[PATCH] build: support configure --without-btrfs

Andreas Schneider asn at samba.org
Tue May 20 04:30:46 MDT 2014


On Friday 16 May 2014 18:01:09 David Disseldorp wrote:
> Thanks to Kai's great SambaXP micro-server scaling talk for the
> inspiration.

RB+
 
> Signed-off-by: David Disseldorp <ddiss at samba.org>
> ---
>  source3/wscript | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/source3/wscript b/source3/wscript
> index 2bca8fa..107ce11 100644
> --- a/source3/wscript
> +++ b/source3/wscript
> @@ -61,6 +61,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('btrfs',
> default=None)
> 
> 
>  def configure(conf):
> @@ -1891,7 +1892,12 @@ main() {
>      if conf.CONFIG_SET('HAVE_GPFS'):
>  	default_shared_modules.extend(TO_LIST('vfs_gpfs'))
> 
> -    if conf.CONFIG_SET('HAVE_LINUX_IOCTL'):
> +    if Options.options.with_btrfs == True:
> +	if conf.CONFIG_SET('HAVE_LINUX_IOCTL'):
> +	    default_shared_modules.extend(TO_LIST('vfs_btrfs'))
> +	else:
> +            conf.fatal("linux ioctl not available, but --with-btrfs was
> specified") +    elif Options.options.with_btrfs is None and
> conf.CONFIG_SET('HAVE_LINUX_IOCTL'):
> default_shared_modules.extend(TO_LIST('vfs_btrfs'))
> 
>      if conf.CONFIG_SET('SAMBA_FAM_LIBS'):

-- 
Andreas Schneider                   GPG-ID: CC014E3D
Samba Team                             asn at samba.org
www.samba.org



More information about the samba-technical mailing list