From 5c16a0618579d1dca03f33159390b371e6853604 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 14 Oct 2008 21:46:58 +0200
Subject: Allow auto-detect if --enable-merged-build was not specified.

---
 source3/configure.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source3/configure.in b/source3/configure.in
index 1eba4a0a58..55a6926186 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6219,7 +6219,8 @@ MSG
 fi
 
 AC_ARG_ENABLE(merged-build, 
-[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])])
+[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])], 
+[], [ enable_merged_build=auto ])
 
 if test x$enable_merged_build = xyes; then
 	MERGED_BUILD=1
-- 
cgit