[SCM] Samba Shared Repository - branch v3-4-stable updated - release-4-0-0alpha7-754-g8a342f1

[Karolin Seeger]

The branch, v3-4-stable has been updated
       via  8a342f1ceadb2d5387f3a4767e978ab4f493af29 (commit)
       via  1f52a50169cd20e3255f52e0533f74706709eb09 (commit)
       via  8dc9b345d66e76866124af66f92ffeb941f81224 (commit)
      from  556c3b3a13e3ec4c8032b6ea35a116a30f3232d3 (commit)

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


- Log -----------------------------------------------------------------
commit 8a342f1ceadb2d5387f3a4767e978ab4f493af29
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 3b028d8609d29de2610d1c91d3098aa6002b90c4)

commit 1f52a50169cd20e3255f52e0533f74706709eb09
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Apr 15 09:51:45 2009 +0200

    s3/WHATSNEW: Add some more Franky specific stuff.
    
    Karolin
    (cherry picked from commit 4d5306d047674676fe8f4e788cac88def055841a)

commit 8dc9b345d66e76866124af66f92ffeb941f81224
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Apr 15 09:27:02 2009 +0200

    s3/WHATSNEW: Add reference to Franky.
    
    Karolin
    (cherry picked from commit 0df89b9a991adf692b26f2c5e50d0ed90e244849)

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

Summary of changes:
 WHATSNEW.txt         |   26 ++++++++++++++++++++++++++
 source3/configure.in |    7 ++++---
 2 files changed, 30 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 066f718..569bba2 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -3,17 +3,42 @@
 
                    =================================
 
+
 This is the first preview release of Samba 3.4.  This is *not*
 intended for production environments and is designed for testing
 purposes only.  Please report any defects via the Samba bug reporting
 system at https://bugzilla.samba.org/.
 
+
 Major enhancements in Samba 3.4.0 include:
+------------------------------------------
+
+General changes:
+o Samba4 and Samba3 sources are included in the tarball
 
 Authentication Changes:
 o Changed the way smbd handles untrusted domain names given during user
   authentication
 
+
+General Changes
+===============
+
+On the way towards a standalone Samba AD domain controller, Samba3 and Samba4
+branches can be built as "merged" build. That's why Samba3 and Samba4 sources
+are included in the tarball. The merged build is possible in Samba 3.4.0, but
+disabled by default. To learn more about the merged build,
+please see http://wiki.samba.org/index.php/Franky.
+
+According to this one, there is no "source" directory included in the tarball at
+all. Samba3 sources are located in "source3", Samba4 sources are located in
+"source4". The libraries have been moved to the toplevel directory.
+
+To build plain Samba3, please change to "source3" and start the build as usual.
+To build Samba4 as well, please use the "--enable-merged-build" configure
+option.
+
+
 Authentication Changes
 ======================
 
@@ -32,6 +57,7 @@ on smbd to always pass through bogus names to the DC for verification.  A new
 parameter "map untrusted to domain" can be enabled to revert to the legacy
 behavior.
 
+
 ######################################################################
 Reporting bugs & Development Discussion
 #######################################
diff --git a/source3/configure.in b/source3/configure.in
index 2025527..33b45a1 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6380,9 +6380,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