From 4fa9c3187df4c8bfb40d57d2fb3c107b9b20bf47 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 2 Apr 2010 00:13:26 +1100
Subject: s4-waf: updates for the new python installer from jelmer

---
 source4/scripting/python/samba_external/wscript_build | 11 -----------
 source4/scripting/python/wscript_build                |  2 --
 2 files changed, 13 deletions(-)
 delete mode 100644 source4/scripting/python/samba_external/wscript_build

(limited to 'source4/scripting')

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)
-- 
cgit