summaryrefslogtreecommitdiff
path: root/source4/configure.ac
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-05-06 15:31:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:52:02 -0500
commit30baa7f39ec053cfcc2b5a6cf1471c1d5ca15137 (patch)
tree440d907057c567d65df0a63e3e680c5552c0f011 /source4/configure.ac
parent31d28c5b8cc22fb158a808a1f9d3d0c8ed5d2090 (diff)
downloadsamba-30baa7f39ec053cfcc2b5a6cf1471c1d5ca15137.tar.gz
samba-30baa7f39ec053cfcc2b5a6cf1471c1d5ca15137.tar.bz2
samba-30baa7f39ec053cfcc2b5a6cf1471c1d5ca15137.zip
r22697: Support building with external talloc.
(This used to be commit 3a2f9e0977bc311daa8171ea709a9cbcdd0a0c85)
Diffstat (limited to 'source4/configure.ac')
-rw-r--r--source4/configure.ac5
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/configure.ac b/source4/configure.ac
index f8450b01d1..8c7a38d25c 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -25,7 +25,10 @@ m4_include(lib/util/time.m4)
m4_include(lib/popt/samba.m4)
m4_include(lib/charset/config.m4)
m4_include(lib/socket/config.m4)
-m4_include(lib/talloc/libtalloc.m4)
+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)
m4_include(lib/ldb/sqlite3.m4)
m4_include(lib/ldb/libldb.m4)