merged-build: force non-shared build for samba4

This should fix 'make test4'.

metze

diff --git a/source3/configure.in b/source3/configure.in
index 615ab9e19ffcdb3ba9f36e2e7364920e0b272a53..1a25de89920ff3612022df1f3e2b52fdf7709dfa 100644 (file)
--- 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)