r22698: Support using system tdb, when available.

(This used to be commit 4d3f02e845577be4a995398dbc5322da8d470009)

diff --git a/source4/configure.ac b/source4/configure.ac
index 8c7a38d25c037fd10a3e9320cd7f8689b18bcca3..69d755271d7eba8d89816a311067a45b82dc9268 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -29,7 +29,10 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.0, [], [
        m4_include(lib/talloc/libtalloc.m4)
        SMB_INCLUDE_MK(lib/talloc/config.mk)
 ])
-m4_include(lib/tdb/libtdb.m4)
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0, [], [
+    m4_include(lib/tdb/libtdb.m4)
+    SMB_INCLUDE_MK(lib/tdb/config.mk)
+])
 m4_include(lib/ldb/sqlite3.m4)
 m4_include(lib/ldb/libldb.m4)
 m4_include(lib/tls/config.m4)

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index e41f284392ce2fe8ddc33e277314d35bd7a596d5..813ddf649d4aff7986f53386715b4c08b38d31c6 100644 (file)
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -3,7 +3,6 @@ include samba3/config.mk
 include socket/config.mk
 include charset/config.mk
 include ldb/config.mk
-include tdb/config.mk
 include tls/config.mk
 include registry/config.mk
 include messaging/config.mk