add a new name for the region-layering-editor-action that tells us we were started...

[ardour.git] / libs / pbd / wscript

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 51dda6d7ce76f7d7a67209aa5b090e1a88b194b3..8afc89ea87d9be4dd77707564783385b1e81b18f 100644 (file)
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -19,6 +19,7 @@ LIBPBD_LIB_VERSION = '4.1.0'
 # Variables for 'waf dist'
 APPNAME = 'libpbd'
 VERSION = LIBPBD_VERSION
+I18N_PACKAGE = 'libpbd4'
 
 # Mandatory variables
 top = '.'
@@ -39,10 +40,10 @@ def configure(conf):
     if sys.platform != 'darwin':
         autowaf.check_pkg(conf, 'uuid', uselib_store='UUID')
 
-    conf.check(function_name='getmntent', header_name='mntent.h', define_name='HAVE_GETMNTENT')
-    conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO')
-    conf.check(header_name='unistd.h', define_name='HAVE_UNISTD')
-    if conf.check_cc(function_name='posix_memalign', header_name='stdlib.h', cflags='-D_XOPEN_SOURCE=600') == False:
+    conf.check(function_name='getmntent', header_name='mntent.h', define_name='HAVE_GETMNTENT',mandatory=False)
+    conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO',mandatory=False)
+    conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False)
+    if conf.check_cc(function_name='posix_memalign', header_name='stdlib.h', cflags='-D_XOPEN_SOURCE=600',mandatory=False) == False:
         conf.define ('NO_POSIX_MEMALIGN',1)
 
     conf.write_config_header('libpbd-config.h', remove=False)
@@ -108,26 +109,26 @@ 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 = ['.']
     obj.includes     = ['.']
     obj.name         = 'libpbd'
     obj.target       = 'pbd'
-    obj.uselib       = 'GLIBMM SIGCPP XML UUID SNDFILE'
+    obj.uselib       = 'GLIBMM SIGCPP XML UUID SNDFILE GIOMM'
     if sys.platform == 'darwin':
         TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
         obj.source += 'cocoa_open_uri.mm'
         obj.uselib += ' OSX'
     obj.vnum         = LIBPBD_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-    obj.cxxflags     = ['-DPACKAGE="libpbd"']
+    obj.defines     = ['PACKAGE="' + I18N_PACKAGE + '"']
 
     if bld.env['build_target'] == 'x86_64':
-        obj.cxxflags += [ '-DUSE_X86_64_ASM' ]
+        obj.defines += [ 'USE_X86_64_ASM' ]
 
-    if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
+    if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
         # Unit tests
         testobj              = bld(features = 'cxx cxxprogram')
         testobj.source       = '''