[PATCH] snapper: add configure option to control build (default: auto)

Matt Taylor liverbugg at rinux.org
Fri May 8 18:05:16 UTC 2020

Recently the samba packages on Gentoo Linux had a hard dependency on
dbus added.  This is because the vfs_snapper module is enabled
automagically on the existence of dbus headers with no option to
disable it.  See: https://bugs.gentoo.org/721320 for the Gentoo bug
where it was suggested this be reported upstream.

This patch adds a configure option to control the build of snapper
similar to other vfs modules.

Signed-off-by: Matt Taylor <liverbugg at rinux.org>
-------------- next part --------------
diff -ru samba-master/source3/wscript samba-master-patch/source3/wscript
--- samba-master/source3/wscript	2020-05-08 07:16:18.000000000 -0400
+++ samba-master-patch/source3/wscript	2020-05-08 13:21:58.000000000 -0400
@@ -75,6 +75,8 @@
     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=None)
                   help=("enable support for VxFS (default=no)"),
                   action="store_true", dest='enable_vxfs', default=False)
@@ -1752,11 +1754,12 @@
     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')
     if conf.CHECK_CFG(package='liburing', args='--cflags --libs',
                       msg='Checking for liburing package', uselib_store="URING"):

More information about the samba-technical mailing list