From c3ab29265546a56377a22ddc67701871ea41262c Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 3 Feb 2009 02:32:57 +0100
Subject: merged-build: force non-shared build for samba4

This should fix 'make test4'.

metze
---
 source3/configure.in | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3')

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)
-- 
cgit