Give the user a hint about whether a merged build would be possible.

diff --git a/source3/configure.in b/source3/configure.in
index 55a6926186c83466622e9f8c95e70227bc941571..7d05b631228ab545124af45c0f9fd9507f7f3276 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6222,6 +6222,27 @@ AC_ARG_ENABLE(merged-build,
 [AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])], 
 [], [ enable_merged_build=auto ])
 
+if test x$enable_merged_build = xauto; then
+       merged_build_possible=yes
+
+       # Check for GNU make
+       m4_include(../source4/build/m4/check_make.m4)
+       AC_SAMBA_GNU_MAKE([true], [merged_build_possible=no])
+
+       # Check for perl
+       m4_include(../source4/build/m4/check_perl.m4)
+       AC_SAMBA_PERL([true], [merged_build_possible=no])
+
+       # Check for python
+       m4_include(../source4/build/m4/check_python.m4)
+       AC_SAMBA_PYTHON_DEVEL([true], [merged_build_possible=no])
+
+       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
+fi
+
 if test x$enable_merged_build = xyes; then
        MERGED_BUILD=1
        m4_include(samba4.m4)

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 9cf01507def3a28ac05ba1dbd6797f82f17a5784..2f932689e1203397b83e838601a05e80ad9d0fca 100644 (file)
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -87,7 +87,6 @@ eventsdir="../source4/lib/events"
 m4_include(lib/events/libevents.m4)
 
 dnl m4_include(auth/kerberos/config.m4)
-m4_include(scripting/python/config.m4)
 m4_include(auth/gensec/config.m4)
 m4_include(smbd/process_model.m4)
 m4_include(ntvfs/posix/config.m4)