From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 9 Feb 2024 09:24:38 +0000 (+1300)
Subject: ldb: Remove the ability for Samba to compile against a system LDB
X-Git-Tag: tdb-1.4.11~1607
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f50febc99f29d6cd47da86144851aa60bb131a2;p=thirdparty%2Fsamba.git

ldb: Remove the ability for Samba to compile against a system LDB

Samba will either provide the LDB to the system, or use a
private ldb, we will not use any other LDB from the system.

This is essentially equilvilant to the patch Debian has used
for Samba 4.17 and later, named "Force-LDB-as-standalone.patch"

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 8d9156b0e3d..5f33d4b65f4 100644
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -69,38 +69,6 @@ def configure(conf):
 
     conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
 
-    if not conf.env.standalone_ldb:
-        max_ldb_version = [int(x) for x in VERSION.split(".")]
-        max_ldb_version[2] = 999
-        max_ldb_version_dots = "%d.%d.%d" % tuple(max_ldb_version)
-
-        if conf.env.disable_python:
-            if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb',
-                                             minversion=VERSION,
-                                             maxversion=max_ldb_version_dots,
-                                             onlyif='talloc tdb tevent',
-                                             implied_deps='replace talloc tdb tevent'):
-                conf.define('USING_SYSTEM_LDB', 1)
-        else:
-            using_system_pyldb_util = True
-            dflt_name = 'pyldb-util' + conf.all_envs['default']['PYTHON_SO_ABI_FLAG']
-            if not conf.CHECK_BUNDLED_SYSTEM_PKG(dflt_name,
-                                                 minversion=VERSION,
-                                                 maxversion=max_ldb_version_dots,
-                                                 onlyif='talloc tdb tevent',
-                                                 implied_deps='replace talloc tdb tevent ldb'):
-                using_system_pyldb_util = False
-
-            if using_system_pyldb_util:
-                conf.define('USING_SYSTEM_PYLDB_UTIL', 1)
-
-            if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb',
-                                             minversion=VERSION,
-                                             maxversion=max_ldb_version_dots,
-                                             onlyif='talloc tdb tevent %s' % dflt_name,
-                                             implied_deps='replace talloc tdb tevent'):
-                conf.define('USING_SYSTEM_LDB', 1)
-
     if not conf.CHECK_CODE('return !(sizeof(size_t) >= 8)',
                            "HAVE_64_BIT_SIZE_T_FOR_LMDB",
                            execute=True,