diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-05-06 15:46:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:52:03 -0500 |
| commit | b3a4fd11e9a006ca6cd2a6910d7dfd68af0a6c9a (patch) | |
| tree | ecaef79f03c3ae3be794b2016764a0e2b8829511 /source4 | |
| parent | 30baa7f39ec053cfcc2b5a6cf1471c1d5ca15137 (diff) | |
| download | samba-b3a4fd11e9a006ca6cd2a6910d7dfd68af0a6c9a.tar.gz samba-b3a4fd11e9a006ca6cd2a6910d7dfd68af0a6c9a.tar.bz2 samba-b3a4fd11e9a006ca6cd2a6910d7dfd68af0a6c9a.zip | |
r22698: Support using system tdb, when available.
(This used to be commit 4d3f02e845577be4a995398dbc5322da8d470009)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/configure.ac | 5 | ||||
| -rw-r--r-- | 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 |