From 6b595a93c1eb380ef6120dbbcc0c6e6bb7092deb Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 26 Sep 2009 13:53:27 +0200 Subject: ldb: Check for talloc using pkg-config before checking manually, so we find version errors. --- source4/lib/ldb/external/libtalloc.m4 | 7 ++++--- 1 file 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"])])]) -- cgit