summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-21 16:04:54 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-21 16:04:54 +0200
commit8fe59b9b00072dc4e12314624bbb692ceb776efd (patch)
tree8401aae295192dd369d276c632bb9269a7c32689 /source3
parent3678a98dcdb6267e0279b638d7008acfa3a0ee8b (diff)
downloadsamba-8fe59b9b00072dc4e12314624bbb692ceb776efd.tar.gz
samba-8fe59b9b00072dc4e12314624bbb692ceb776efd.tar.bz2
samba-8fe59b9b00072dc4e12314624bbb692ceb776efd.zip
Automatically enable merged build (for more complete 'make test') when possible during developer builds.
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index a97d535c77..cd849349c0 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