diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-15 16:35:13 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-04-15 09:07:12 +0200 |
| commit | eff788a2f9ecda464d65421a0200043cfccc9216 (patch) | |
| tree | 5192c60d058db2c85a7d5812a86bc4d85987c66e /source4 | |
| parent | 2fa558625d5ae64fddf492aedae793e51b6ff88b (diff) | |
| download | samba-eff788a2f9ecda464d65421a0200043cfccc9216.tar.gz samba-eff788a2f9ecda464d65421a0200043cfccc9216.tar.xz samba-eff788a2f9ecda464d65421a0200043cfccc9216.zip | |
configure: Add common file with minimum versions of external libraries.
(cherry picked from commit 0ea702efaeaadcdcb05e99e838dae1b2dbdd95b9)
(cherry picked from commit 606b55d220c354f11299d633b1387afd4bc47c55)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/configure.ac | 10 | ||||
| -rw-r--r-- | source4/min_versions.m4 | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index a1eb4f4b468..065a3300cab 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -42,14 +42,16 @@ AC_CONFIG_FILES(param/samba-hostconfig.pc) AC_CONFIG_FILES(librpc/dcerpc_samr.pc) AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc) -SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= 1.3.0, [], +m4_include(min_versions.m4) + +SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= $TALLOC_MIN_VERSION, [], [ m4_include(../lib/talloc/libtalloc.m4) SMB_INCLUDE_MK(../lib/talloc/config.mk) ] ) -SMB_INCLUDED_LIB_PKGCONFIG(LIBTDB, tdb >= 1.1.3, +SMB_INCLUDED_LIB_PKGCONFIG(LIBTDB, tdb >= $TDB_MIN_VERSION, [], [ m4_include(../lib/tdb/libtdb.m4) @@ -59,13 +61,13 @@ SMB_INCLUDED_LIB_PKGCONFIG(LIBTDB, tdb >= 1.1.3, SMB_INCLUDE_MK(../lib/tdb/python.mk) -SMB_INCLUDED_LIB_PKGCONFIG(LIBTEVENT, tevent = 0.9.4, +SMB_INCLUDED_LIB_PKGCONFIG(LIBTEVENT, tevent = TEVENT_REQUIRED_VERSION, [],[m4_include(../lib/tevent/samba.m4)] ) SMB_INCLUDE_MK(../lib/tevent/python.mk) -SMB_INCLUDED_LIB_PKGCONFIG(LIBLDB, ldb = 0.9.3, +SMB_INCLUDED_LIB_PKGCONFIG(LIBLDB, ldb = $LDB_REQUIRED_VERSION, [ SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk) SMB_INCLUDE_MK(lib/ldb/tools/config.mk) diff --git a/source4/min_versions.m4 b/source4/min_versions.m4 new file mode 100644 index 00000000000..46f45a1bf33 --- /dev/null +++ b/source4/min_versions.m4 @@ -0,0 +1,6 @@ +# Minimum and exact required versions for various libraries +# if we use the ones installed in the system. +TDB_MIN_VERSION=1.1.3 +TALLOC_MIN_VERSION=1.3.0 +LDB_REQUIRED_VERSION=0.9.3 +TEVENT_REQUIRED_VERSION=0.9.4 |