From 4bdbf5581656a0a288af24677ebde7fc51c7974e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= Date: Fri, 10 Jul 2020 12:52:04 +0200 Subject: [PATCH] Revert "build: add configure option to control vfs_snapper build" This reverts commit 7ae03a19b3ca895ba5f97a6bd4f9539d8daa6e0a. We have a working way to disable shared modules and this commits breaks that. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14437 Signed-off-by: Bjoern Jacke --- source3/wscript | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/source3/wscript b/source3/wscript index 587708159740..219d1b3448e1 100644 --- a/source3/wscript +++ b/source3/wscript @@ -95,7 +95,6 @@ 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)"), @@ -1770,16 +1769,11 @@ main() { if Options.options.enable_vxfs: conf.DEFINE('HAVE_VXFS', '1') - if Options.options.with_snapper: - if conf.CHECK_CFG(package='dbus-1', args='--cflags --libs', + 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') - else: - conf.fatal("vfs_snapper is enabled but prerequisite DBUS libraries " - "or headers not found. Use --disable-snapper to disable " - "vfs_snapper support."); + conf.DEFINE('HAVE_DBUS', '1') if conf.CHECK_CFG(package='liburing', args='--cflags --libs', msg='Checking for liburing package', uselib_store="URING"): -- 2.25.1