Upgrade waf.

fluid/wscript

@@ -33,5 +33,9 @@ def build(bld):
                  target='ntk-fluid',
                  includes = [ '.', '../' ],
                  use = [ 'ntk_images_shared', 'ntk_shared' ],
+		 # FIXME: why is this now neccessary with new waf version?
+                 uselib = [
+ 'LIBJPEG', 'LIBPNG', 'LIBZ', 'DL', 'M', 'PTHREAD' ,
+                    'X11', 'FONTCONFIG', 'XFT', 'CAIRO', 'DL', 'M', 'PTHREAD' ], 
                  install_path = '${BINDIR}' )
     

wscript

@@ -38,7 +38,7 @@ def makelib(bld,*k,**kw):
     kw['cflags'] = [ '-fPIC' ]
     kw['cxxflags'] = [ '-fPIC' ]
     kw['defines'] = [ 'FL_LIBRARY=1', 'FL_INTERNALS=1' ]
-    kw['vnum'] = API_VERSION
+    kw['vnum'] = PACKAGE_VERSION
     kw['install_path'] = '${LIBDIR}'
     kw['features' ] = 'c cxx cxxstlib'
     kw['name'] = kw['target'] + '_static'