summaryrefslogtreecommitdiff
path: root/source4/scripting/python
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-02 00:13:26 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:22 +1000
commit4fa9c3187df4c8bfb40d57d2fb3c107b9b20bf47 (patch)
tree725d9ee973204bdd41c4779acd9b4256aa00d79b /source4/scripting/python
parentba64e236d59619cb4222225ac98efe2a2c07f592 (diff)
downloadsamba-4fa9c3187df4c8bfb40d57d2fb3c107b9b20bf47.tar.gz
samba-4fa9c3187df4c8bfb40d57d2fb3c107b9b20bf47.tar.bz2
samba-4fa9c3187df4c8bfb40d57d2fb3c107b9b20bf47.zip
s4-waf: updates for the new python installer from jelmer
Diffstat (limited to 'source4/scripting/python')
-rw-r--r--source4/scripting/python/samba_external/wscript_build11
-rw-r--r--source4/scripting/python/wscript_build2
2 files changed, 0 insertions, 13 deletions
diff --git a/source4/scripting/python/samba_external/wscript_build b/source4/scripting/python/samba_external/wscript_build
deleted file mode 100644
index 45e00d062a..0000000000
--- a/source4/scripting/python/samba_external/wscript_build
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-# work out what external modules need to be installed
-external_list = []
-try:
- import dns.resolver
-except:
- external_list.append("dnspython")
-
-for e in external_list:
- bld.INSTALL_WILDCARD('${PYTHONDIR}/samba_external', e + '/**/*', flat=False, exclude='*.pyc')
diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index 0d0fabd54e..2a09869a21 100644
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -39,6 +39,4 @@ bld.SAMBA_SCRIPT('samba_python',
pattern='samba/**/*.py',
installdir='python')
-bld.BUILD_SUBDIR('samba_external')
-
bld.INSTALL_WILDCARD('${PYTHONDIR}', 'samba/**/*.py', flat=False)