From b3a4fd11e9a006ca6cd2a6910d7dfd68af0a6c9a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 6 May 2007 15:46:24 +0000 Subject: r22698: Support using system tdb, when available. (This used to be commit 4d3f02e845577be4a995398dbc5322da8d470009) --- source4/configure.ac | 5 ++++- source4/lib/basic.mk | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source4/configure.ac b/source4/configure.ac index 8c7a38d25c..69d755271d 100644 --- 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 e41f284392..813ddf649d 100644 --- 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 -- cgit