patches/waf-install.patch

   1 Fix WAF to work as an autotools module type.
   2
   3 Index: waf-1.4.4/wscript
   4 ===================================================================
   5 --- waf-1.4.4.orig/wscript      2009-05-04 20:49:36.000000000 +0700
   6 +++ waf-1.4.4/wscript   2009-05-04 20:49:45.000000000 +0700
   7 @@ -314,9 +314,6 @@
   8                         sys.exit(0)
   9
  10         if Params.g_commands['install']:
  11 -               val = Params.g_options.yes or (not sys.stdin.isatty() or raw_input("Installing Waf is discouraged. Proceed? [y/n]"))
  12 -               if val != True and val != "y": sys.exit(1)
  13 -
  14                 compute_revision()
  15
  16                 create_waf()
  17 Index: waf-1.4.4/utils/autogen.sh
  18 ===================================================================
  19 --- waf-1.4.4.orig/utils/autogen.sh     2009-05-04 20:49:36.000000000 +0700
  20 +++ waf-1.4.4/utils/autogen.sh  2009-05-04 20:52:38.000000000 +0700
  21 @@ -2,7 +2,14 @@
  22
  23  # This script is an autogen.sh-like wrapper for allowing WAF to be installed by jhbuild
  24
  25 -WAF=./waf-light
  26 +srcdir=`dirname $0`
  27 +if test -n "$srcdir"; then
  28 +  srcdir=$srcdir/..
  29 +else
  30 +  srcdir=.
  31 +fi
  32 +
  33 +WAF=$srcdir/waf-light
  34  prefix=""
  35
  36  while test -n "$1"; do
  37 @@ -47,3 +54,5 @@
  38
  39  EOF
  40
  41 +$srcdir/configure --prefix=$prefix
  42 +$srcdir/waf configure $prefix