Allow auto-detect if --enable-merged-build was not specified.

diff --git a/source3/configure.in b/source3/configure.in
index 1eba4a0a58122fc5ee1477926daa3a0e7fac2a9a..55a6926186c83466622e9f8c95e70227bc941571 100644 (file)
--- 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