Upgrade to waf 1.8.5.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5496 a436a847-0d15-0410-975c-d299462d15a1

4 files changed, 15 insertions, 13 deletions

diff --git a/src/server/wscript b/src/server/wscript
index 47090d90..2ab1dfe9 100644
--- a/src/server/wscript
+++ b/src/server/wscript
@@ -70,7 +70,7 @@ def build(bld):
                   cxxflags        = bld.env.INGEN_TEST_CXXFLAGS)
         autowaf.use_lib(bld, obj, core_libs)
 
-    if bld.is_defined('HAVE_JACK'):
+    if bld.env.HAVE_JACK:
         obj = bld(features        = 'cxx cxxshlib',
                   source          = 'JackDriver.cpp ingen_jack.cpp',
                   includes        = ['.', '../..'],
diff --git a/src/socket/wscript b/src/socket/wscript
index 488bb7d9..6db7cea2 100644
--- a/src/socket/wscript
+++ b/src/socket/wscript
@@ -2,7 +2,7 @@
 from waflib.extras import autowaf as autowaf
 
 def build(bld):
-    if bld.is_defined('HAVE_SOCKET'):
+    if bld.env.HAVE_SOCKET:
         obj = bld(features        = 'cxx cxxshlib',
                   source          = ['SocketReader.cpp',
                                      'SocketWriter.cpp',
@@ -11,7 +11,8 @@ def build(bld):
                   name            = 'libingen_socket_server',
                   target          = 'ingen_socket_server',
                   install_path    = '${LIBDIR}',
-                  use             = 'libingen_server')
+                  use             = 'libingen_server',
+                  lib             = ['pthread'])
         autowaf.use_lib(bld, obj, 'GLIBMM SERD SORD SRATOM RAUL LV2')
 
         obj = bld(features        = 'cxx cxxshlib',
@@ -22,5 +23,6 @@ def build(bld):
                   name            = 'libingen_socket_client',
                   target          = 'ingen_socket_client',
                   install_path    = '${LIBDIR}',
-                  use             = 'libingen_server')
+                  use             = 'libingen_server',
+                  lib             = ['pthread'])
         autowaf.use_lib(bld, obj, 'GLIBMM SERD SORD SRATOM RAUL LV2')
diff --git a/waf b/waf
index a59c289c..faf9ddef 100755
--- a/waf
+++ b/waf
diff --git a/wscript b/wscript
index 82650d55..9fa2b694 100644
--- a/wscript
+++ b/wscript
@@ -103,7 +103,7 @@ def configure(conf):
                        define_name='HAVE_GCOV',
                        mandatory=False)
 
-        if conf.is_defined('HAVE_GCOV'):
+        if conf.is_defiend('HAVE_GCOV'):
             conf.env.INGEN_TEST_LIBS     = ['gcov']
             conf.env.INGEN_TEST_CXXFLAGS = ['-fprofile-arcs', '-ftest-coverage']
         else:
@@ -118,10 +118,10 @@ def configure(conf):
 
     autowaf.define(conf, 'INGEN_VERSION', INGEN_VERSION)
 
-    if not Options.options.no_gui and conf.is_defined('HAVE_GANV'):
+    if not Options.options.no_gui and conf.env.HAVE_GANV:
         autowaf.define(conf, 'INGEN_BUILD_GUI', 1)
 
-    if conf.is_defined('HAVE_JACK'):
+    if conf.env.HAVE_JACK:
         autowaf.define(conf, 'HAVE_JACK_MIDI', 1)
 
     autowaf.define(conf, 'INGEN_DATA_DIR',
@@ -133,17 +133,17 @@ def configure(conf):
 
     conf.write_config_header('ingen_config.h', remove=False)
 
-    autowaf.display_msg(conf, "Jack", conf.is_defined('HAVE_JACK'))
+    autowaf.display_msg(conf, "Jack", bool(conf.env.HAVE_JACK))
     autowaf.display_msg(conf, "Jack session support",
-                        conf.is_defined('INGEN_JACK_SESSION'))
+                        bool(conf.env.INGEN_JACK_SESSION))
     autowaf.display_msg(conf, "Jack metadata support",
                         conf.is_defined('HAVE_JACK_METADATA'))
     autowaf.display_msg(conf, "Socket interface", conf.is_defined('HAVE_SOCKET'))
-    autowaf.display_msg(conf, "LV2", conf.is_defined('HAVE_LILV'))
-    autowaf.display_msg(conf, "GUI", str(conf.env.INGEN_BUILD_GUI == 1))
+    autowaf.display_msg(conf, "LV2", bool(conf.env.HAVE_LILV))
+    autowaf.display_msg(conf, "GUI", bool(conf.env.INGEN_BUILD_GUI))
     autowaf.display_msg(conf, "LV2 bundle", conf.env.INGEN_BUNDLE_DIR)
     autowaf.display_msg(conf, "HTML plugin documentation support",
-                        conf.is_defined('HAVE_WEBKIT'))
+                        bool(conf.env.HAVE_WEBKIT))
     print('')
 
 def build(bld):
@@ -167,7 +167,7 @@ def build(bld):
     bld.recurse('src/client')
     bld.recurse('src/socket')
 
-    if bld.is_defined('INGEN_BUILD_GUI'):
+    if bld.env.INGEN_BUILD_GUI:
         bld.recurse('src/gui')
 
     # Program