s4-waf: new autogen-waf.sh

this one will work with the tdb, talloc, etc directories

4 files changed, 28 insertions, 26 deletions

diff --git a/source4/Makefile.waf b/buildtools/scripts/Makefile.waf
index 1e950ed18c..e17ae217df 100644
--- a/source4/Makefile.waf
+++ b/buildtools/scripts/Makefile.waf
@@ -1,16 +1,11 @@
 # simple makefile wrapper to run waf
 
-# don't enable WAFCACHE by default yet, as it doesn't
-# have any way to limit its size. This could cause
-# problems in the build farm
-# WAF=WAFCACHE=$(HOME)/.wafcache ../buildtools/waf
-
 # default to using only 1 cpu, to be friendly to build
 # farm machines. I wonder how we get at the -jN option
 # from make to pass it to waf?
 JOBS=1
 
-WAF=JOBS=$(JOBS) ../buildtools/bin/waf
+WAF=JOBS=$(JOBS) BUILDTOOLS/bin/waf
 
 all:
 	$(WAF) build
diff --git a/buildtools/scripts/configure.waf b/buildtools/scripts/configure.waf
new file mode 100755
index 0000000000..a6367e7314
--- /dev/null
+++ b/buildtools/scripts/configure.waf
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+
+WAF=BUILDTOOLS/bin/waf
+
+# using JOBS=1 gives maximum compatibility with
+# systems like AIX which have broken threading in python
+JOBS=1
+export JOBS
+
+$WAF configure $*
diff --git a/source4/autogen-waf.sh b/source4/autogen-waf.sh
index 2e4869721c..9cb144afcf 100755
--- a/source4/autogen-waf.sh
+++ b/source4/autogen-waf.sh
@@ -1,9 +1,22 @@
 #!/bin/sh
 
 echo "Setting up for waf build"
-ln -sf configure.waf configure
 
+echo "Looking for the buildtools directory"
+
+d="buildtools"
+while test \! -d $d; do d="../$d"; done
+
+echo "Found buildtools in $d"
+
+echo "Setting up configure"
+rm -f configure
+sed "s|BUILDTOOLS|$d|g" < "$d/scripts/configure.waf" > configure
+chmod +x configure
+
+echo "Setting up makefile"
 # this relies on the fact that make looks for 'makefile' before 'Makefile'
-ln -sf Makefile.waf makefile
+rm -f makefile
+sed "s|BUILDTOOLS|$d|g" < "$d/scripts/Makefile.waf" > makefile
 
-echo "done ... now run ./configure or ./configure.developer"
+echo "done. Now run ./configure or ./configure.developer then make"
diff --git a/source4/configure.waf b/source4/configure.waf
deleted file mode 100755
index 128ac93057..0000000000
--- a/source4/configure.waf
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-echo "Using waf based build"
-
-WAF=../buildtools/bin/waf
-
-# using JOBS=1 gives maximum compatibility with
-# systems like AIX which have broken threading in python
-JOBS=1
-export JOBS
-
-# don't enable WAFCACHE by default till it is
-# size limited
-#export WAFCACHE=$HOME/.wafcache
-#mkdir -p $WAFCACHE
-
-$WAF configure $*