git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
d579ae8
)
s3:build: link libtalloc as shared lib if using shared libs at all
author
Michael Adam
<obnox@samba.org>
Fri, 6 May 2011 14:42:07 +0000
(16:42 +0200)
committer
Michael Adam
<obnox@samba.org>
Sat, 14 May 2011 11:01:45 +0000
(13:01 +0200)
(cherry picked from commit
6c300ec4b51bfd57837d193f0b17b60cb152fc27
)
source3/configure.in
patch
|
blob
|
history
diff --git
a/source3/configure.in
b/source3/configure.in
index c716eb592e533f8cd671f4c0036e2212a81abb85..600d2be1af58d594d62baa7da4a302a0d3e42ff4 100644
(file)
--- a/
source3/configure.in
+++ b/
source3/configure.in
@@
-2101,7
+2101,9
@@
fi
if test "x$enable_external_libtalloc" = xno
then
m4_include(../lib/talloc/libtalloc.m4)
- LINK_LIBTALLOC=STATIC
+ if test x"$USESHARED" == x"no" ; then
+ LINK_LIBTALLOC=STATIC
+ fi
LIBTALLOCVERSION=`grep ^VERSION ${tallocdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
SMB_LIBRARY(talloc, 2, ${LIBTALLOCVERSION})
LIBTALLOC_OBJ0=""