git.samba.org
/
obnox
/
samba-ctdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c01873e
)
s3:build: determine full version of libtalloc for the samba build
author
Michael Adam
<obnox@samba.org>
Fri, 6 May 2011 14:40:59 +0000
(16:40 +0200)
committer
Michael Adam
<obnox@samba.org>
Sat, 14 May 2011 11:01:45 +0000
(13:01 +0200)
(cherry picked from commit
472cabbdea3d5def7e7a36b19c5851a0cf0d8d83
)
source3/configure.in
patch
|
blob
|
history
diff --git
a/source3/configure.in
b/source3/configure.in
index 6f35b270ff73119b57e0b3e1c084d7aaea5c80f5..c716eb592e533f8cd671f4c0036e2212a81abb85 100644
(file)
--- a/
source3/configure.in
+++ b/
source3/configure.in
@@
-2102,7
+2102,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}"