summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-09-26 13:53:27 +0200
committerJelmer Vernooij <jelmer@samba.org>2009-09-26 13:53:27 +0200
commit6b595a93c1eb380ef6120dbbcc0c6e6bb7092deb (patch)
tree6dcac04c619136c15404fc309eacb7b3bdafe7d4 /source4
parent8940e42d0ab129317d4c505ed2a401c3f5f9b5f9 (diff)
downloadsamba-6b595a93c1eb380ef6120dbbcc0c6e6bb7092deb.tar.gz
samba-6b595a93c1eb380ef6120dbbcc0c6e6bb7092deb.tar.bz2
samba-6b595a93c1eb380ef6120dbbcc0c6e6bb7092deb.zip
ldb: Check for talloc using pkg-config before checking manually, so we
find version errors.
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/external/libtalloc.m47
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/lib/ldb/external/libtalloc.m4 b/source4/lib/ldb/external/libtalloc.m4
index b681541e07..8c63fcc041 100644
--- a/source4/lib/ldb/external/libtalloc.m4
+++ b/source4/lib/ldb/external/libtalloc.m4
@@ -2,6 +2,7 @@ AC_SUBST(TALLOC_OBJ)
AC_SUBST(TALLOC_CFLAGS)
AC_SUBST(TALLOC_LIBS)
-AC_CHECK_HEADER(talloc.h,
- [AC_CHECK_LIB(talloc, talloc_init, [TALLOC_LIBS="-ltalloc"]) ],
- [PKG_CHECK_MODULES(TALLOC, talloc >= 2.0.0)])
+PKG_CHECK_MODULES(TALLOC, talloc >= 2.0.0,
+ [ ],
+ [ AC_CHECK_HEADER(talloc.h,
+ [ AC_CHECK_LIB(talloc, talloc_init, [TALLOC_LIBS="-ltalloc"])])])