diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/configure.in | 24 | ||||
| -rw-r--r-- | source3/samba4.m4 | 1 |
2 files changed, 23 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index 1eba4a0a58..7d05b63122 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6219,7 +6219,29 @@ 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 = 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 diff --git a/source3/samba4.m4 b/source3/samba4.m4 index 9cf01507de..2f932689e1 100644 --- 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) |