From 9e9e878e8f5f0fba51e3a576f17cf07d0857cff6 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 4 Apr 2010 10:18:39 +1000
Subject: [PATCH] s4-waf: allow standalone tarball build of libraries

---
 lib/talloc/wscript      | 10 +++++++++-
 lib/tdb/wscript         | 11 +++++++++--
 lib/tevent/wscript      | 11 +++++++++--
 source4/lib/ldb/wscript | 10 ++++++++--
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index f2645139169..a7476b7ec40 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 87bdcdf79df..c4b59e3a8f5 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 1298eb45880..41ca66ad155 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 311672fe284..ddd5e138c45 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
 
-- 
2.34.1