From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 9 Feb 2008 19:06:54 +0000 (+0100)
Subject: Merge branch 'v4-0-trivial' into v4-0-python
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=b874f07175ae38a041f53f0e4ac6a4050dcefeae

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

b874f07175ae38a041f53f0e4ac6a4050dcefeae
diff --cc source/scripting/python/config.m4
index 908efd1588e,3acd7321c73..1f03ec8e345
--- a/source/scripting/python/config.m4
+++ b/source/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