summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-05-06 16:40:59 +0200
committerMichael Adam <obnox@samba.org>2011-05-13 16:42:24 +0200
commit472cabbdea3d5def7e7a36b19c5851a0cf0d8d83 (patch)
tree2188d51425a5620c5db134be900ba88da194b3dd /source3
parentb731b6e032d9ba1469c349d6c46bd7bb52b18c28 (diff)
downloadsamba-472cabbdea3d5def7e7a36b19c5851a0cf0d8d83.tar.gz
samba-472cabbdea3d5def7e7a36b19c5851a0cf0d8d83.tar.bz2
samba-472cabbdea3d5def7e7a36b19c5851a0cf0d8d83.zip
s3:build: determine full version of libtalloc for the samba build
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 2e47cf2e64..4edd818e87 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2110,7 +2110,8 @@ if test "x$enable_external_libtalloc" = xno
then
m4_include(../lib/talloc/libtalloc.m4)
LINK_LIBTALLOC=STATIC
- SMB_LIBRARY(talloc, 2)
+ LIBTALLOCVERSION=`grep ^VERSION ${tallocdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
+ SMB_LIBRARY(talloc, 2, ${LIBTALLOCVERSION})
LIBTALLOC_OBJ0=""
for obj in ${TALLOC_OBJ}; do
LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"