diff options
Diffstat (limited to 'source4/lib/ldb/external')
| -rw-r--r-- | source4/lib/ldb/external/libevents.m4 | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/external/libtalloc.m4 | 7 | ||||
| -rw-r--r-- | source4/lib/ldb/external/libtdb.m4 | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source4/lib/ldb/external/libevents.m4 b/source4/lib/ldb/external/libevents.m4 index 6a0e36af8b..af046f1430 100644 --- a/source4/lib/ldb/external/libevents.m4 +++ b/source4/lib/ldb/external/libevents.m4 @@ -3,5 +3,5 @@ AC_SUBST(TEVENT_CFLAGS) AC_SUBST(TEVENT_LIBS) AC_CHECK_HEADER(tevent.h, - [AC_CHECK_LIB(tevent, tevent_context_init, [TEVENT_LIBS="-ltevent"]) ], + [AC_CHECK_LIB(tevent, tevent_context_init, [TEVENT_LIBS="-ltevent"], , -ltalloc) ], [PKG_CHECK_MODULES(TEVENT, tevent)]) diff --git a/source4/lib/ldb/external/libtalloc.m4 b/source4/lib/ldb/external/libtalloc.m4 index a4c5b8a9d9..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)]) +PKG_CHECK_MODULES(TALLOC, talloc >= 2.0.0, + [ ], + [ AC_CHECK_HEADER(talloc.h, + [ AC_CHECK_LIB(talloc, talloc_init, [TALLOC_LIBS="-ltalloc"])])]) diff --git a/source4/lib/ldb/external/libtdb.m4 b/source4/lib/ldb/external/libtdb.m4 index 8c2cab702f..44971e1fa9 100644 --- a/source4/lib/ldb/external/libtdb.m4 +++ b/source4/lib/ldb/external/libtdb.m4 @@ -4,4 +4,4 @@ AC_SUBST(TDB_LIBS) AC_CHECK_HEADER(tdb.h, [AC_CHECK_LIB(tdb, tdb_open, [TDB_LIBS="-ltdb"]) ], - [PKG_CHECK_MODULES(TDB, tdb >= 1.1.0)]) + [PKG_CHECK_MODULES(TDB, tdb >= 1.1.6)]) |