[SCM] Samba Shared Repository - branch v3-6-stable updated

[Karolin Seeger]

The branch, v3-6-stable has been updated
       via  295b30f... s3/configure: Disable the automatic merged build.
      from  9ffcc43... VERSION: Bump version to 3.6.0pre1.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-stable


- Log -----------------------------------------------------------------
commit 295b30fbeb80f1c818a5b813caae3d0e231dc537
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Apr 15 09:52:23 2009 +0200

    s3/configure: Disable the automatic merged build.
    
    Karolin
    (cherry picked from commit 27833f5ec12944ac3e521ee62856654c8cca9eba)

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 905ad23..4c479ce 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


-- 
Samba Shared Repository