summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-29 13:10:43 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-01-29 13:10:43 +0100
commitbcad73a7f7f63b33c02df5a62c7986f2c7dc11ff (patch)
treeb6d617d0f44c3615ca3879d276f6e57061b232e2
parent87e933d886daa2abc30761e307be35170bbb6aeb (diff)
downloadsamba-bcad73a7f7f63b33c02df5a62c7986f2c7dc11ff.tar.gz
samba-bcad73a7f7f63b33c02df5a62c7986f2c7dc11ff.tar.bz2
samba-bcad73a7f7f63b33c02df5a62c7986f2c7dc11ff.zip
Partially revert d64a2288a2cb3a8f74a18b740b265a460773635d and 351c2e99ab8b6a91f7355077b2d2944fd820839c to see if that fixes the build.
(This used to be commit 2a79cebfd99f4048214be65a6c918cc988dc83ed)
-rw-r--r--source4/scripting/python/config.m42
-rw-r--r--source4/torture/config.mk3
2 files changed, 2 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/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
#################################