diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-01-30 11:47:52 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-30 11:47:52 +1100 |
| commit | 3231717e1485c70890c23fbfc3087d970a408815 (patch) | |
| tree | 6bf9ab10ca4e42e0786fae7f1f7f15bf39a9a5c3 | |
| parent | 9cc90f67b3fc4a16a2029a1cb1d98286ae598966 (diff) | |
| parent | 61379d97cd3f4f21cc55d3cf3539e0adfa274b7f (diff) | |
| download | samba-3231717e1485c70890c23fbfc3087d970a408815.tar.gz samba-3231717e1485c70890c23fbfc3087d970a408815.tar.bz2 samba-3231717e1485c70890c23fbfc3087d970a408815.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 8011716734cb8e3c34f85d9d68201f13cb5b8e0a)
| -rw-r--r-- | source4/scripting/python/config.m4 | 2 | ||||
| -rw-r--r-- | source4/scripting/python/pyrpc.h | 5 | ||||
| -rw-r--r-- | source4/torture/config.mk | 3 |
3 files changed, 7 insertions, 3 deletions
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/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 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 ################################# |