4 files changed, 35 insertions, 7 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index f264513916..a7476b7ec4 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -3,9 +3,17 @@
 APPNAME = 'talloc'
 VERSION = '2.0.2'
 
-srcdir = '../..'
 blddir = 'bin'
 
+# find the buildtools directory
+import os
+buildtools = 'buildtools ../../buildtools'
+for d in buildtools.split():
+    if os.path.exists(d):
+        srcdir = os.path.dirname(d) or '.'
+        break
+
+
 LIBREPLACE_DIR= srcdir + '/lib/replace'
 
 import sys
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 87bdcdf79d..c4b59e3a8f 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -3,10 +3,17 @@
 APPNAME = 'tdb'
 VERSION = '1.2.1'
 
-srcdir = '../..'
 blddir = 'bin'
 
-import sys
+import sys, os
+
+# find the buildtools directory
+buildtools = 'buildtools ../../buildtools'
+for d in buildtools.split():
+    if os.path.exists(d):
+        srcdir = os.path.dirname(d) or '.'
+        break
+
 sys.path.insert(0, srcdir+"/buildtools/wafsamba")
 import wafsamba
 
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 1298eb4588..41ca66ad15 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -3,10 +3,17 @@
 APPNAME = 'tevent'
 VERSION = '0.9.8'
 
-srcdir = '../..'
 blddir = 'bin'
 
-import sys
+import sys, os
+
+# find the buildtools directory
+buildtools = 'buildtools ../../buildtools'
+for d in buildtools.split():
+    if os.path.exists(d):
+        srcdir = os.path.dirname(d) or '.'
+        break
+
 sys.path.insert(0, srcdir+"/buildtools/wafsamba")
 import wafsamba
 
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 311672fe28..ddd5e138c4 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -3,10 +3,16 @@
 APPNAME = 'ldb'
 VERSION = '0.9.10'
 
-srcdir = '../../..'
 blddir = 'bin'
 
-import sys
+import sys, os
+# find the buildtools directory
+buildtools = 'buildtools ../../buildtools'
+for d in buildtools.split():
+    if os.path.exists(d):
+        srcdir = os.path.dirname(d) or '.'
+        break
+
 sys.path.insert(0, srcdir+"/buildtools/wafsamba")
 import wafsamba