From 0b3e0bc29200efa4577fd40d9cf8a6a7d7c5d7ba Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 24 Sep 2024 15:48:23 +0200 Subject: [PATCH] ldb: Build lmdb backend also in non-AD case We should build with lmdb support also if it is not in AD case. The lmdb backend is also used e.g. by sssd. If you don't want to build it, you can always specify --without-ldb-lmdb BUG: https://bugzilla.samba.org/show_bug.cgi?id=15721 Signed-off-by: Andreas Schneider Reviewed-by: Douglas Bagnall Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Wed Sep 25 05:36:13 UTC 2024 on atb-devel-224 (cherry picked from commit fdef894d79793feafc286ff9e21cb01e4c777b26) --- lib/ldb/wscript | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/lib/ldb/wscript b/lib/ldb/wscript index 8ae95cbd6d6..ab33f7784a6 100644 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -34,20 +34,16 @@ def configure(conf): Logs.warn("NOTE: Some AD DC parts of selftest will fail") conf.env.REQUIRE_LMDB = False - else: - if Options.options.without_ad_dc: - conf.env.REQUIRE_LMDB = False - else: - if Options.options.without_ldb_lmdb: - if not Options.options.without_ad_dc and \ - conf.CONFIG_GET('ENABLE_SELFTEST'): - raise Errors.WafError('--without-ldb-lmdb conflicts ' - 'with --enable-selftest while ' - 'building the AD DC') + elif Options.options.without_ldb_lmdb: + if not Options.options.without_ad_dc and \ + conf.CONFIG_GET('ENABLE_SELFTEST'): + raise Errors.WafError('--without-ldb-lmdb conflicts ' + 'with --enable-selftest while ' + 'building the AD DC') - conf.env.REQUIRE_LMDB = False - else: - conf.env.REQUIRE_LMDB = True + conf.env.REQUIRE_LMDB = False + else: + conf.env.REQUIRE_LMDB = True # if lmdb support is enabled then we require lmdb # is present, build the mdb back end and enable lmdb support in