Merge branch 'v4-0-trivial' into v4-0-python
authorJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 19:38:07 +0000 (20:38 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 19:38:07 +0000 (20:38 +0100)
Conflicts:

source/scripting/python/config.m4

source/scripting/python/config.m4
source/selftest/target/Samba4.pm

index 77cabdfcb3a96c02886fe7ad917c659328ff1ecf..1f03ec8e345f09546d2a55f9ccc69725d7b2fef9 100644 (file)
@@ -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(LIBPYTHON,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
 
index 87a86ef06fe51bd4cb30f7be5364343436902c47..fba0f6a6f854b375e19c5b0c9168d319de0f325d 100644 (file)
@@ -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");