summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-05-06 16:42:07 +0200
committerMichael Adam <obnox@samba.org>2011-05-13 16:42:24 +0200
commit6c300ec4b51bfd57837d193f0b17b60cb152fc27 (patch)
treec4157ba62225fb4d7cac4ca7c844e6642b628625
parent472cabbdea3d5def7e7a36b19c5851a0cf0d8d83 (diff)
downloadsamba-6c300ec4b51bfd57837d193f0b17b60cb152fc27.tar.gz
samba-6c300ec4b51bfd57837d193f0b17b60cb152fc27.tar.bz2
samba-6c300ec4b51bfd57837d193f0b17b60cb152fc27.zip
s3:build: link libtalloc as shared lib if using shared libs at all
-rw-r--r--source3/configure.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 4edd818e87..34be4fe761 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2109,7 +2109,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=""