summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba_external/wscript_build11
-rw-r--r--source4/scripting/python/wscript_build2
-rw-r--r--source4/wscript_build1
3 files changed, 1 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)
diff --git a/source4/wscript_build b/source4/wscript_build
index a8b0375d2f..f3b20eab36 100644
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -116,3 +116,4 @@ bld.BUILD_SUBDIR('../codepages')
bld.BUILD_SUBDIR('setup')
bld.BUILD_SUBDIR('scripting')
bld.BUILD_SUBDIR('../pidl')
+bld.BUILD_SUBDIR('../lib')