Merge branch 'v4-0-trivial' into v4-0-python
authorJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 19:06:54 +0000 (20:06 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 19:06:54 +0000 (20:06 +0100)
(This used to be commit b874f07175ae38a041f53f0e4ac6a4050dcefeae)

1  2 
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