[jhbuild] [waf] default for waf to be ./waf, as system-wide waf is not supported

[Frederic Peters <fpeters src gnome org>]

commit 1dda018a69c9c1565f061014e2bc22316883fc90
Author: Frédéric Péters <fpeters 0d be>
Date:   Sun Apr 11 15:19:36 2010 +0200

    [waf] default for waf to be ./waf, as system-wide waf is not supported

 jhbuild/modtypes/waf.py |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/jhbuild/modtypes/waf.py b/jhbuild/modtypes/waf.py
index 3df35ec..f8c5fe9 100644
--- a/jhbuild/modtypes/waf.py
+++ b/jhbuild/modtypes/waf.py
@@ -45,7 +45,7 @@ class WafModule(Package, DownloadableModule):
     PHASE_INSTALL        = 'install'
 
     def __init__(self, name, branch, dependencies=[], after=[], suggests=[],
-                 waf_cmd='waf'):
+                 waf_cmd='./waf'):
         Package.__init__(self, name, dependencies, after, suggests)
         self.branch = branch
         self.waf_cmd = waf_cmd
@@ -77,8 +77,6 @@ class WafModule(Package, DownloadableModule):
     def do_configure(self, buildscript):
         builddir = self.get_builddir(buildscript)
         buildscript.set_action(_('Configuring'), self)
-        if not inpath(self.waf_cmd, os.environ['PATH'].split(os.pathsep)):
-            raise CommandError(_('Missing waf, try jhbuild -m bootstrap buildone waf'))
         if buildscript.config.buildroot and not os.path.exists(builddir):
             os.makedirs(builddir)
         cmd = [self.waf_cmd, 'configure', '--prefix', buildscript.config.prefix]
@@ -151,7 +149,7 @@ class WafModule(Package, DownloadableModule):
 
 def parse_waf(node, config, uri, repositories, default_repo):
     module_id = node.getAttribute('id')
-    waf_cmd = 'waf'
+    waf_cmd = './waf'
     if node.hasAttribute('waf-command'):
         waf_cmd = node.getAttribute('waf-command')