diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-26 16:28:45 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-26 16:28:45 +0100 |
| commit | 494e471d747c1e858481fad16cb33574d3e7f985 (patch) | |
| tree | 3a32106bbb266c11a59b835df27b3482d203dc77 | |
| parent | 50189e81d04edd313f707fc3bb7f18e46389e9e6 (diff) | |
| download | samba-494e471d747c1e858481fad16cb33574d3e7f985.tar.gz samba-494e471d747c1e858481fad16cb33574d3e7f985.tar.bz2 samba-494e471d747c1e858481fad16cb33574d3e7f985.zip | |
configure: Use m4 defines for minimum library versions rather than shell
variables, so the values rather than the variable names show up in
configure output.
| -rw-r--r-- | source3/samba4.m4 | 8 | ||||
| -rw-r--r-- | source4/configure.ac | 6 | ||||
| -rw-r--r-- | source4/min_versions.m4 | 8 |
3 files changed, 11 insertions, 11 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) diff --git a/source4/configure.ac b/source4/configure.ac index 065a3300ca..3c23f27d68 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -44,14 +44,14 @@ AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc) m4_include(min_versions.m4) -SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= $TALLOC_MIN_VERSION, [], +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 >= $TDB_MIN_VERSION, +SMB_INCLUDED_LIB_PKGCONFIG(LIBTDB, tdb >= TDB_MIN_VERSION, [], [ m4_include(../lib/tdb/libtdb.m4) @@ -67,7 +67,7 @@ SMB_INCLUDED_LIB_PKGCONFIG(LIBTEVENT, tevent = TEVENT_REQUIRED_VERSION, SMB_INCLUDE_MK(../lib/tevent/python.mk) -SMB_INCLUDED_LIB_PKGCONFIG(LIBLDB, ldb = $LDB_REQUIRED_VERSION, +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 index eaefbd5148..1dd3501b99 100644 --- a/source4/min_versions.m4 +++ b/source4/min_versions.m4 @@ -1,6 +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.5 +define(TDB_MIN_VERSION,1.1.3) +define(TALLOC_MIN_VERSION,1.3.0) +define(LDB_REQUIRED_VERSION,0.9.3) +define(TEVENT_REQUIRED_VERSION,0.9.5) |