summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-09 20:47:12 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-09 20:47:12 +0100
commit63aa4b902144873243e37eb7d7ce91d30b886abc (patch)
tree91fc815e7df22bdb4596af116aa713b49f09657d
parent0af38050dda392c42fd6b2d7982c94663b6286e0 (diff)
downloadsamba-63aa4b902144873243e37eb7d7ce91d30b886abc.tar.gz
samba-63aa4b902144873243e37eb7d7ce91d30b886abc.tar.bz2
samba-63aa4b902144873243e37eb7d7ce91d30b886abc.zip
Remove unused define.
(This used to be commit 64d6d729135e1b3b19c9bdbbe973fcdaca15e8b3)
-rw-r--r--source4/scripting/python/config.m41
-rw-r--r--source4/torture/libnet/libnet_BecomeDC.c10
2 files changed, 3 insertions, 8 deletions
diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 1f03ec8e34..908efd1588 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -66,7 +66,6 @@ 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])
AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([Python not found. Please install Python 2.x and its development headers/libraries.])
diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c
index 0ef6a03a6a..0dd06bda4c 100644
--- a/source4/torture/libnet/libnet_BecomeDC.c
+++ b/source4/torture/libnet/libnet_BecomeDC.c
@@ -275,7 +275,6 @@ static NTSTATUS test_become_dc_prepare_db_ejs(void *private_data,
return NT_STATUS_OK;
}
-#ifdef HAVE_WORKING_PYTHON
#include "param/param.h"
#include <Python.h>
#include "scripting/python/modules.h"
@@ -381,7 +380,6 @@ static NTSTATUS test_become_dc_prepare_db_py(void *private_data,
return NT_STATUS_OK;
}
-#endif /* HAVE_WORKING_PYTHON */
static NTSTATUS test_apply_schema(struct test_become_dc_state *s,
const struct libnet_BecomeDC_StoreChunk *c)
@@ -878,12 +876,10 @@ bool torture_net_become_dc(struct torture_context *torture)
b.in.callbacks.private_data = s;
b.in.callbacks.check_options = test_become_dc_check_options;
- b.in.callbacks.prepare_db = test_become_dc_prepare_db_ejs;
-#ifdef HAVE_WORKING_PYTHON
- if (getenv("PROVISION_PYTHON")) {
- b.in.callbacks.prepare_db = test_become_dc_prepare_db_py;
+ b.in.callbacks.prepare_db = test_become_dc_prepare_db_py;
+ if (getenv("PROVISION_EJS")) {
+ b.in.callbacks.prepare_db = test_become_dc_prepare_db_ejs;
}
-#endif
b.in.callbacks.schema_chunk = test_become_dc_schema_chunk;
b.in.callbacks.config_chunk = test_become_dc_store_chunk;
b.in.callbacks.domain_chunk = test_become_dc_store_chunk;