From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 21 Oct 2008 14:04:54 +0000 (+0200)
Subject: Automatically enable merged build (for more complete 'make test') when possible durin... 
X-Git-Tag: samba-4.0.0alpha6~772
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=8fe59b9b00072dc4e12314624bbb692ceb776efd

Automatically enable merged build (for more complete 'make test') when possible during developer builds.
---

diff --git a/source3/configure.in b/source3/configure.in
index a97d535c77d..cd849349c08 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6236,7 +6236,10 @@ if test x$enable_merged_build = xauto; then
 	AC_MSG_CHECKING([whether it would be possible to do a merged build])
 	AC_MSG_RESULT([$merged_build_possible])
 
-	dnl FIXME: enable_merged_build=$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
 fi
 
 if test x$enable_merged_build = xyes; then