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

[ira/wip.git] / source / scripting / python / config.m4

diff --git a/source/scripting/python/config.m4 b/source/scripting/python/config.m4
index e4a34ece1ebd7db842df3465a212246678d52c1b..1f03ec8e345f09546d2a55f9ccc69725d7b2fef9 100644 (file)
--- a/source/scripting/python/config.m4
+++ b/source/scripting/python/config.m4
@@ -66,12 +66,9 @@ if test $working_python = yes; then
        SMB_ENABLE(EXT_LIB_PYTHON,YES)
        SMB_ENABLE(smbpython,YES)
        SMB_ENABLE(LIBPYTHON,YES)
-       dnl AC_DEFINE(HAVE_WORKING_PYTHON, 1, [Whether we have working python support])
+       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