s3/configure: Disable the automatic merged build.

Karolin

diff --git a/source3/configure.in b/source3/configure.in
index 905ad23efcc0d974c104b56d04de0619b1ae8b6c..4c479ce5db88c7d6616e690f06007e7741856949 100644 (file)
--- 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