[PATCH] snapper: add configure option to control build (default: auto)
Matt Taylor
liverbugg at rinux.org
Mon May 11 20:55:48 UTC 2020
On Sat, May 9, 2020 at 8:07 PM David Disseldorp <ddiss at samba.org> wrote:
>
> Hi Matt,
>
> There's some white-space damage below the new samba_add_onoff_option
> line. The empty line between snapper and cephfs should also be removed.
>
> Otherwise this looks fine to me:
> Reviewed-by: David Disseldorp <ddiss at samba.org>
>
> I expect the new default dbus dependency will catch a few people, but
> the clear instructions on how to disable it should help.
>
> As with your other patch, please use git format with a commit message
> and sign off.
> See https://wiki.samba.org/index.php/Contribute#Mailing_patches_to_samba-technical
>
I've removed the extra white space. I think I did this correctly,
it's my first time using git to try to submit a patch.
Thank you for reviewing and working with me on this.
-Matt
-------------- next part --------------
From 4dd5b1ae74159235553ce0c8a9f5b8dfa076cd11 Mon Sep 17 00:00:00 2001
From: Matt Taylor <liverbugg at rinux.org>
Date: Mon, 11 May 2020 15:26:41 -0400
Subject: [PATCH] snapper: add configure option to control build (default: true)
Signed-off-by: Matt Taylor <liverbugg at rinux.org>
---
source3/wscript | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/source3/wscript b/source3/wscript
index 76abcf79c90..c50fd2bc4d9 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -74,6 +74,7 @@ def options(opt):
opt.samba_add_onoff_option('glusterfs', with_name="enable", without_name="disable", default=True)
opt.samba_add_onoff_option('cephfs', with_name="enable", without_name="disable", default=True)
+ opt.samba_add_onoff_option('snapper', with_name="enable", without_name="disable", default=True)
opt.add_option('--enable-vxfs',
help=("enable support for VxFS (default=no)"),
@@ -1752,11 +1753,16 @@ main() {
if Options.options.enable_vxfs:
conf.DEFINE('HAVE_VXFS', '1')
- if conf.CHECK_CFG(package='dbus-1', args='--cflags --libs',
+ if Options.options.with_snapper:
+ if conf.CHECK_CFG(package='dbus-1', args='--cflags --libs',
msg='Checking for dbus', uselib_store="DBUS-1"):
- if (conf.CHECK_HEADERS('dbus/dbus.h', lib='dbus-1')
+ if (conf.CHECK_HEADERS('dbus/dbus.h', lib='dbus-1')
and conf.CHECK_LIB('dbus-1', shlib=True)):
- conf.DEFINE('HAVE_DBUS', '1')
+ conf.DEFINE('HAVE_DBUS', '1')
+ else:
+ conf.fatal("vfs_snapper is enabled but prerequisite DBUS libraries "
+ "or headers not found. Use --disable-snapper to disable "
+ "vfs_snapper support.");
if conf.CHECK_CFG(package='liburing', args='--cflags --libs',
msg='Checking for liburing package', uselib_store="URING"):
--
2.26.2
More information about the samba-technical
mailing list