more changes to wscript files to catch up with waf 1.6 and fix OS X issues

git-svn-id: svn://localhost/ardour2/branches/3.0@10176 d708f5d6-7413-0410-9779-e7cbd77b26cf

10 files changed, 40 insertions, 35 deletions

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 0bde5477e0..410555f9af 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -336,7 +336,7 @@ def build_color_scheme(path, prefix):
 def build(bld):
     # GTK front-end; if we're using VST we build this as a shared library,
     # otherwise it's a normal executabale
-    if bld.env['VST_SUPPORT']:
+    if bld.is_defined('VST_SUPPORT'):
         obj = bld(features = 'cxx c cxxshlib')
     else:
         obj = bld(features = 'cxx c cxxprogram')
@@ -345,7 +345,7 @@ def build(bld):
     obj.source       = gtk2_ardour_sources
     obj.name         = 'gtk2_ardour'
     obj.linkflags    = []
-    if bld.env['VST_SUPPORT']:
+    if bld.is_defined('VST_SUPPORT'):
         obj.target = 'gtk2_ardour'
         obj.includes += ['../libs/fst']
     else:
@@ -377,28 +377,28 @@ def build(bld):
         obj.source += [ 'lv2_plugin_ui.cc' ]
         obj.uselib += ' SLV2 '
 
-    if bld.env['FREESOUND']:
+    if bld.is_defined('FREESOUND'):
         obj.source +=  [ 'sfdb_freesound_mootcher.cc' ]
 
-    if bld.env['VST_SUPPORT']:
+    if bld.is_defined('VST_SUPPORT'):
         obj.source += [ 'vst_pluginui.cc' ]
         obj.defines += [ 'VST_SUPPORT' ]
         bld.env.append ('LINKFLAGS', '-lX11')
 
-    if bld.env['LXVST_SUPPORT']:
+    if bld.is_defined('LXVST_SUPPORT'):
         obj.source += [ 'lxvst_pluginui.cc' ]
         obj.defines += [ 'LXVST_SUPPORT' ]
         obj.linkflags += [ '-lX11' ]
 
-    if bld.env['PHONE_HOME']:
+    if bld.is_defined('PHONE_HOME'):
         obj.defines += [ 'PHONE_HOME' ]
 
-    if bld.env['COREAUDIO']:
+    if bld.is_defined('COREAUDIO'):
         TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
         obj.source += [ 'cocoacarbon.mm', 'au_pluginui.mm' ]
         obj.use += ' libappleutility '
 
-    if bld.env['VST_SUPPORT']:
+    if bld.is_defined('VST_SUPPORT'):
         # If we require VST support we build a stub main() and the FST library
         # here using winegcc, and link it to the GTK front-end library
         obj = bld(features = 'cxx c cxxprogram wine')
@@ -455,7 +455,7 @@ def build(bld):
     base_font       = ""
 
     # Set up font sizes
-    if bld.env['IS_OSX']: # OS X fonts
+    if bld.is_defined('GTKOSX'): # OS X fonts
         basefont = "Lucida Grande"
         font_sizes = {
                 'TINY' : '7',
@@ -567,7 +567,7 @@ def build(bld):
 
     # Menus
     menus_argv = []
-    if bld.env['GTKOSX']:
+    if bld.is_defined('GTKOSX'):
         menus_argv = [ '-E', '-P', '-DGTKOSX' ]
     else:
         menus_argv = [ '-E', '-P' ]
@@ -612,7 +612,7 @@ def build(bld):
     bld.install_files('${SYSCONFDIR}/ardour3/export', bld.path.ant_glob('export/*.format'))
 
     # i18n
-    if bld.env['ENABLE_NLS']:
+    if bld.is_defined('ENABLE_NLS'):
         mo_files = bld.path.ant_glob ('po/*.mo')
         for mo in mo_files:
             lang = os.path.basename (mo).replace ('.mo', '')
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 4007ab9d20..29948e3555 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -391,22 +391,22 @@ def build(bld):
                         'uri_map.cc', 'rdff.c' ]
         obj.uselib += ['SLV2','RASQAL']
 
-    if bld.env['VST_SUPPORT']:
+    if bld.is_defined('VST_SUPPORT'):
         obj.source += [ 'vst_plugin.cc', 'session_vst.cc' ]
         obj.includes += [ '../fst' ]
         obj.defines += [ 'VST_SUPPORT' ]
 
-    if bld.env['LXVST_SUPPORT']:
+    if bld.is_defined('LXVST_SUPPORT'):
         obj.source += [ 'lxvst_plugin.cc', 'session_lxvst.cc', 'vstfx.cc', 'vstfxwin.cc', 'vstfxinfofile.cc' ]
         obj.defines += [ 'LXVST_SUPPORT' ]
 
 
-    if bld.env['COREAUDIO']:
+    if bld.is_defined('COREAUDIO'):
         obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ]
         obj.use    += ['libappleutility']
         obj.source += [ 'audio_unit.cc' ]
 
-    if bld.env['FPU_OPTIMIZATION']:
+    if bld.is_defined('FPU_OPTIMIZATION'):
         if (bld.env['build_target'] == 'i386'
             or bld.env['build_target'] == 'i686'):
             obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
@@ -414,7 +414,7 @@ def build(bld):
             obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ]
 
     # i18n
-    if bld.env['ENABLE_NLS']:
+    if bld.is_defined('ENABLE_NLS'):
         mo_files = bld.path.ant_glob('po/*.mo')
         for mo in mo_files:
             lang = os.path.basename(mo).replace('.mo', '')
@@ -422,7 +422,7 @@ def build(bld):
                                         lang, 'LC_MESSAGES', 'libardour3.mo'),
                            mo)
 
-    if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
+    if bld.is_defined('BUILD_TESTS') and bld.is_defined('HAVE_CPPUNIT'):
         # Unit tests
         testobj              = bld(features = 'cxx cxxprogram')
         testobj.source       = '''
@@ -450,7 +450,7 @@ def build(bld):
             'VAMP_DIR="' + os.path.join(
                 os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"'
             ]
-        if bld.env['FPU_OPTIMIZATION']:
+        if bld.is_defined('FPU_OPTIMIZATION'):
             testobj.source += [ 'sse_functions_xmm.cc' ]
             if (bld.env['build_target'] == 'i386'
                 or bld.env['build_target'] == 'i686'):
diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript
index 172f3b13b7..14ddcd3d3c 100644
--- a/libs/audiographer/wscript
+++ b/libs/audiographer/wscript
@@ -78,7 +78,7 @@ def build(bld):
     audiographer.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
 
-    if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
+    if bld.is_defined('BUILD_TESTS') and bld.is_defined('HAVE_CPPUNIT'):
         # Unit tests
         obj              = bld(features = 'cxx cxxprogram')
         obj.source       = '''
@@ -95,7 +95,7 @@ def build(bld):
                 tests/general/silence_trimmer_test.cc
         '''
 
-        if bld.env['HAVE_ALL_GTHREAD']:
+        if bld.is_defined('HAVE_ALL_GTHREAD'):
             obj.source += '''
                     tests/general/threader_test.cc
             '''
diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index a98573a68b..314fe2a2f0 100644
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -97,7 +97,7 @@ def build(bld):
     obj.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
     obj.defines = ['PACKAGE="libevoral"' ]
 
-    if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
+    if bld.is_defined('BUILD_TESTS') and bld.is_defined('HAVE_CPPUNIT'):
         # Static library (for unit test code coverage)
         obj = bld(features = 'cxx cstlib')
         obj.source       = lib_source
diff --git a/libs/gnomecanvas/wscript b/libs/gnomecanvas/wscript
index 0ab45977b9..f5d444f008 100644
--- a/libs/gnomecanvas/wscript
+++ b/libs/gnomecanvas/wscript
@@ -49,6 +49,8 @@ def configure(conf):
     autowaf.configure(conf)
     autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.18')
     autowaf.check_pkg(conf, 'libart-2.0', uselib_store='LIBART', atleast_version='2.3')
+    autowaf.check_pkg(conf, 'pango', uselib_store='PANGO', atleast_version='1.28')
+    autowaf.check_pkg(conf, 'pangoft2', uselib_store='PANGOFT2', atleast_version='1.28')
 
 def build(bld):
     # Library
@@ -58,7 +60,7 @@ def build(bld):
     obj.includes     = ['.']
     obj.name         = 'libgnomecanvas-2'
     obj.target       = 'gnomecanvas-2'
-    obj.uselib       = 'GLIB GTK LIBART'
+    obj.uselib       = 'GLIB GTK LIBART PANGO PANGOFT2'
     obj.vnum         = LIBGNOMECANVAS_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 64f19e2d02..a07b33e8fe 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -91,13 +91,13 @@ def build(bld):
                     '-DPACKAGE="libgtkmm2ext"',
                     '-DLOCALEDIR="' + os.path.join(
                             os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
-    if bld.env['GTKOSX']:
+    if bld.is_defined('GTKOSX'):
         obj.source += ['gtkapplication_quartz.mm']
     else:
         obj.source += ['gtkapplication_x11.c']
 
     # i18n
-    if bld.env['ENABLE_NLS']:
+    if bld.is_defined('ENABLE_NLS'):
         mo_files = bld.path.ant_glob ('po/*.mo')
         for mo in mo_files:
             lang = os.path.basename (mo).replace ('.mo', '')
diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 729aa7ead1..577e902532 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -108,7 +108,7 @@ def build(bld):
             xml++.cc
     '''
 
-    if bld.env['DEBUG_RT_ALLOC']:
+    if bld.is_defined('DEBUG_RT_ALLOC'):
         obj.source += 'debug_rt_alloc.c'
 
     obj.export_includes = ['.']
@@ -127,7 +127,7 @@ def build(bld):
     if bld.env['build_target'] == 'x86_64':
         obj.cxxflags += [ '-DUSE_X86_64_ASM' ]
 
-    if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
+    if bld.is_defined ('BUILD_TESTS') and bld.is_defined('HAVE_CPPUNIT'):
         # Unit tests
         testobj              = bld(features = 'cxx cxxprogram')
         testobj.source       = '''
diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 6635a443e1..8bd59f5daf 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -67,14 +67,14 @@ def build(bld):
     bld.recurse('control_protocol')
     bld.recurse('generic_midi')
     bld.recurse('mackie')
-    if bld.env['BUILD_OSC']:
-        bld.add_subdirs('osc')
-    if bld.env['BUILD_POWERMATE']:
-        bld.add_subdirs('powermate')
-    if bld.env['BUILD_WIIMOTE']:
-        bld.add_subdirs('wiimote')
-    if bld.env['BUILD_TRANZPORT']:
-        bld.add_subdirs('tranzport')
+    if bld.is_defined ('BUILD_OSC'):
+        bld.recurse('osc')
+    if bld.is_defined('BUILD_POWERMATE'):
+        bld.recurse('powermate')
+    if bld.is_defined('BUILD_WIIMOTE'):
+        bld.recurse('wiimote')
+    if bld.is_defined('BUILD_TRANZPORT'):
+        bld.recurse('tranzport')
 
 def shutdown():
     autowaf.shutdown()
diff --git a/templates/wscript b/templates/wscript
index 4e1bb0fd6b..3deb74c8d7 100644
--- a/templates/wscript
+++ b/templates/wscript
@@ -11,7 +11,7 @@ def configure(conf):
 def build(bld):
 
     subst_dict = {}
-    if bld.env['COREAUDIO']:
+    if bld.is_defined('COREAUDIO'):
         subst_dict['%JACK_INPUT%'] = 'coreaudio:Built-in Audio:in'
         subst_dict['%JACK_OUTPUT%'] = 'coreaudio:Built-in Audio:out'
     else:
diff --git a/wscript b/wscript
index 6feb3504de..e400b6e198 100644
--- a/wscript
+++ b/wscript
@@ -37,6 +37,9 @@ children = [
         'export',
 ]
 
+#if config[config_arch] != 'apple':
+#  children += [ 'tools/sanity_check' ]
+
 i18n_children = [
         'gtk2_ardour',
         'libs/ardour',