Merge branch 'v4-0-trivial' into v4-0-python

(This used to be commit b874f07175ae38a041f53f0e4ac6a4050dcefeae)

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 3acd7321c73b83a05e60c3ffcace0481b3dce801..1f03ec8e345f09546d2a55f9ccc69725d7b2fef9 100644 (file)
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -69,9 +69,6 @@ if test $working_python = yes; then
        AC_DEFINE(HAVE_WORKING_PYTHON, 1, [Whether we have working python support])
        AC_MSG_RESULT([yes])
 else
-       SMB_ENABLE(EXT_LIB_PYTHON,NO)
-       SMB_ENABLE(LIBPYTHONyy,NO)
-       SMB_ENABLE(smbpython,NO)
-       AC_MSG_RESULT([no])
+       AC_MSG_ERROR([Python not found. Please install Python 2.x and its development headers/libraries.])
 fi
 

diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm
index 87a86ef06fe51bd4cb30f7be5364343436902c47..fba0f6a6f854b375e19c5b0c9168d319de0f325d 100644 (file)
--- a/source4/selftest/target/Samba4.pm
+++ b/source4/selftest/target/Samba4.pm
@@ -660,12 +660,12 @@ nogroup:x:65534:nobody
        my @provision_options = ();
        push (@provision_options, "NSS_WRAPPER_PASSWD=\"$nsswrap_passwd\"");
        push (@provision_options, "NSS_WRAPPER_GROUP=\"$nsswrap_group\"");
-       if (defined($ENV{PROVISION_PYTHON})) {
-               push (@provision_options, "$self->{bindir}/smbpython");
-               push (@provision_options, "$self->{setupdir}/provision.py");
-       } else {
+       if (defined($ENV{PROVISION_EJS})) {
                push (@provision_options, "$self->{bindir}/smbscript");
                push (@provision_options, "$self->{setupdir}/provision");
+       } else {
+               push (@provision_options, "$self->{bindir}/smbpython");
+               push (@provision_options, "$self->{setupdir}/provision.py");
        }
        push (@provision_options, split(' ', $configuration));
        push (@provision_options, "--host-name=$netbiosname");