git.samba.org
/
tridge
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8940e42
)
ldb: Check for talloc using pkg-config before checking manually, so we
author
Jelmer Vernooij
<jelmer@samba.org>
Sat, 26 Sep 2009 11:53:27 +0000
(13:53 +0200)
committer
Jelmer Vernooij
<jelmer@samba.org>
Sat, 26 Sep 2009 11:53:27 +0000
(13:53 +0200)
find version errors.
source4/lib/ldb/external/libtalloc.m4
patch
|
blob
|
history
diff --git
a/source4/lib/ldb/external/libtalloc.m4
b/source4/lib/ldb/external/libtalloc.m4
index b681541e0706832f509b06147bab6cbb1a00e463..8c63fcc0416964bfb6c6bf987e5d4406b109ce3d 100644
(file)
--- 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"])])])