From bcad73a7f7f63b33c02df5a62c7986f2c7dc11ff Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 29 Jan 2008 13:10:43 +0100 Subject: Partially revert d64a2288a2cb3a8f74a18b740b265a460773635d and 351c2e99ab8b6a91f7355077b2d2944fd820839c to see if that fixes the build. (This used to be commit 2a79cebfd99f4048214be65a6c918cc988dc83ed) --- source4/scripting/python/config.m4 | 2 +- source4/torture/config.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'source4') diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4 index 3acd7321c7..e4a34ece1e 100644 --- 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/torture/config.mk b/source4/torture/config.mk index ac3216c5b3..0ee7873628 100644 --- 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 ################################# -- cgit From 61379d97cd3f4f21cc55d3cf3539e0adfa274b7f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 29 Jan 2008 14:27:27 +0100 Subject: python: Provide PyAPI_DATA macro for older versions of Python (< 2.3). (This used to be commit 421bdd203eab09e560f4919715fa4cc4497e406f) --- source4/scripting/python/pyrpc.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source4') diff --git a/source4/scripting/python/pyrpc.h b/source4/scripting/python/pyrpc.h index 5390c6923d..3a5d235cfc 100644 --- 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 -- cgit