[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  f78b83c... s3/configure: Disable the automatic merged build.
      from  bc0dc5a... s3-rpc_client: make sure cli_rpc_pipe_open_schannel() does not always return NT_STATUS_OK.

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


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

    s3/configure: Disable the automatic merged build.
    
    Karolin

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

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 e42ca3e..ac7b471 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6545,9 +6545,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.4.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