svn commit: samba r22698 - in branches/SAMBA_4_0/source: . lib

[jelmer at samba.org]

Author: jelmer
Date: 2007-05-06 15:46:24 +0000 (Sun, 06 May 2007)
New Revision: 22698

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22698

Log:
Support using system tdb, when available.
Modified:
   branches/SAMBA_4_0/source/configure.ac
   branches/SAMBA_4_0/source/lib/basic.mk


Changeset:
Modified: branches/SAMBA_4_0/source/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/configure.ac	2007-05-06 15:31:03 UTC (rev 22697)
+++ branches/SAMBA_4_0/source/configure.ac	2007-05-06 15:46:24 UTC (rev 22698)
@@ -29,7 +29,10 @@
 	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)

Modified: branches/SAMBA_4_0/source/lib/basic.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/basic.mk	2007-05-06 15:31:03 UTC (rev 22697)
+++ branches/SAMBA_4_0/source/lib/basic.mk	2007-05-06 15:46:24 UTC (rev 22698)
@@ -3,7 +3,6 @@
 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