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

(This used to be commit b874f07175ae38a041f53f0e4ac6a4050dcefeae)

diff --cc source4/scripting/python/config.m4
index 908efd1588e880a77860328b33a28ee6df749cb2,3acd7321c73b83a05e60c3ffcace0481b3dce801..1f03ec8e345f09546d2a55f9ccc69725d7b2fef9
--- 1/source4/scripting/python/config.m4
--- 2/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@@ -66,8 -66,12 +66,9 @@@ if test $working_python = yes; the
        SMB_ENABLE(EXT_LIB_PYTHON,YES)
        SMB_ENABLE(smbpython,YES)
        SMB_ENABLE(LIBPYTHON,YES)
+       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