[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-756-g3b028d8

Karolin Seeger kseeger at samba.org
Wed Apr 15 07:53:49 GMT 2009


The branch, v3-4-test has been updated
       via  3b028d8609d29de2610d1c91d3098aa6002b90c4 (commit)
       via  4d5306d047674676fe8f4e788cac88def055841a (commit)
      from  0df89b9a991adf692b26f2c5e50d0ed90e244849 (commit)

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


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

    s3/configure: Disable the automatic merged build.
    
    Karolin

commit 4d5306d047674676fe8f4e788cac88def055841a
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

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

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


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index ec23830..569bba2 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -27,13 +27,16 @@ 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.
+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". To build plain Samba3, please change to "source3" and start the
-build as usual.
+"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
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


More information about the samba-cvs mailing list