summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-02-03 02:32:57 +0100
committerStefan Metzmacher <metze@samba.org>2009-02-03 16:31:01 +0100
commitc3ab29265546a56377a22ddc67701871ea41262c (patch)
tree9d5a8bbe7951b4d908545c71467514fdf40e349c
parent63bb31e11812264aa377abdd4c256c46dde236b0 (diff)
downloadsamba-c3ab29265546a56377a22ddc67701871ea41262c.tar.gz
samba-c3ab29265546a56377a22ddc67701871ea41262c.tar.bz2
samba-c3ab29265546a56377a22ddc67701871ea41262c.zip
merged-build: force non-shared build for samba4
This should fix 'make test4'. metze
-rw-r--r--source3/configure.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 615ab9e19f..1a25de8992 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6537,7 +6537,10 @@ fi
if test x$enable_merged_build = xyes; then
MERGED_BUILD=1
+ saved_USESHARED="$USESHARED"
+ USESHARED="false"
m4_include(samba4.m4)
+ USESHARED="$saved_USESHARED"
fi
AC_SUBST(ZLIB_LIBS)