From 295b30fbeb80f1c818a5b813caae3d0e231dc537 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Wed, 15 Apr 2009 09:52:23 +0200 Subject: [PATCH] s3/configure: Disable the automatic merged build. Karolin (cherry picked from commit 27833f5ec12944ac3e521ee62856654c8cca9eba) --- source3/configure.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source3/configure.in b/source3/configure.in index 905ad23efcc..4c479ce5db8 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6816,9 +6816,10 @@ if test x$enable_merged_build = xauto; then AC_MSG_RESULT([$merged_build_possible]) # Enable merged build automatically if possible, when in developer mode - if test "x$developer" = xyes; then - enable_merged_build=$merged_build_possible - fi + # Don't enable merged build automatically in 3.6.0. + #if test "x$developer" = xyes; then + # enable_merged_build=$merged_build_possible + #fi fi if test x$enable_merged_build = xyes; then -- 2.11.4.GIT