diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-03-27 09:32:43 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-03-27 09:32:43 +1100 |
| commit | 049534336c8df538ab3c384c0f505cf3bc6a1300 (patch) | |
| tree | ec85d0e9c539d07a1df44412aa4b26e8b98ccaba /source3/samba4.m4 | |
| parent | d88ced1dccd8f6eb6a1931d3ccae2c7cb0667020 (diff) | |
| parent | e235b4628b473f30275a534f5172c8926d3f205d (diff) | |
| download | samba-049534336c8df538ab3c384c0f505cf3bc6a1300.tar.gz samba-049534336c8df538ab3c384c0f505cf3bc6a1300.tar.bz2 samba-049534336c8df538ab3c384c0f505cf3bc6a1300.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/samba4.m4')
| -rw-r--r-- | source3/samba4.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/samba4.m4 b/source3/samba4.m4 index b5c7c74689..568283cd87 100644 --- a/source3/samba4.m4 +++ b/source3/samba4.m4 @@ -69,14 +69,14 @@ AC_CONFIG_FILES(../source4/librpc/dcerpc_atsvc.pc) m4_include(../source4/min_versions.m4) -SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= $TALLOC_MIN_VERSION, +SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= TALLOC_MIN_VERSION, [], [ SMB_INCLUDE_MK(../lib/talloc/config.mk) ] ) -SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= $TDB_MIN_VERSION, +SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= TDB_MIN_VERSION, [], [ m4_include(../lib/tdb/libtdb.m4) @@ -86,13 +86,13 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= $TDB_MIN_VERSION, SMB_INCLUDE_MK(../lib/tdb/python.mk) -SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent = $TEVENT_REQUIRED_VERSION, +SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent = TEVENT_REQUIRED_VERSION, [],[m4_include(../lib/tevent/samba.m4)] ) SMB_INCLUDE_MK(../lib/tevent/python.mk) -SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = $LDB_REQUIRED_VERSION, +SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = LDB_REQUIRED_VERSION, [ SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk) SMB_INCLUDE_MK(lib/ldb/tools/config.mk) |