Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet

(This used to be commit 8011716734cb8e3c34f85d9d68201f13cb5b8e0a)

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 3acd7321c73b83a05e60c3ffcace0481b3dce801..e4a34ece1ebd7db842df3465a212246678d52c1b 100644 (file)
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -66,7 +66,7 @@ if test $working_python = yes; then
        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])
+       dnl AC_DEFINE(HAVE_WORKING_PYTHON, 1, [Whether we have working python support])
        AC_MSG_RESULT([yes])
 else
        SMB_ENABLE(EXT_LIB_PYTHON,NO)

diff --git a/source4/scripting/python/pyrpc.h b/source4/scripting/python/pyrpc.h
index 5390c6923da95d29c5fc8da7a3c45970935b1486..3a5d235cfccb6a968f248aa6be1859a26c79ab0b 100644 (file)
--- a/source4/scripting/python/pyrpc.h
+++ b/source4/scripting/python/pyrpc.h
@@ -27,3 +27,8 @@
 #define dom_sid28_Type dom_sid_Type
 #define dom_sid2_Check dom_sid_Check
 #define dom_sid28_Check dom_sid28_Check
+
+/* This macro is only provided by Python >= 2.3 */
+#ifndef PyAPI_DATA
+#   define PyAPI_DATA(RTYPE) extern RTYPE
+#endif

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index ac3216c5b322caa31c09a7ac258b9afa76b687e4..0ee7873628e946b47132fad70fc331efe00ab3be 100644 (file)
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -297,8 +297,7 @@ PRIVATE_DEPENDENCIES = \
                LIBSAMBA-NET \
                smbcalls \
                POPT_CREDENTIALS \
-               torture_rpc \
-               LIBPYTHON
+               torture_rpc
 # End SUBSYSTEM TORTURE_NET
 #################################