bump to 3.1

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 547ac3d06d8e42aef5539c6aabe42af8bf53c4f3..433f1a6f3c10d14e5a6af3f026a50f90045f9ffc 100644 (file)
--- a/wscript
+++ b/wscript
@@ -15,8 +15,8 @@ if sys.platform == 'darwin':
     OSX_VERSION = '3.0beta6'
     VERSION = '3.0beta6'
 else:
-    LINUX_VERSION = '3.0'
-    VERSION = '3.0'
+    LINUX_VERSION = '3.1'
+    VERSION = '3.1'
 
 APPNAME = 'Ardour3'
 
@@ -42,7 +42,6 @@ children = [
         'libs/clearlooks-newer',
         'libs/audiographer',
         'gtk2_ardour',
-        'templates',
         'export',
         'midi_maps',
         'mcp',
@@ -406,6 +405,10 @@ def options(opt):
                     help='Do not build with Freesound database support')
     opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile',
                     help='Compile for use with gprofile')
+    opt.add_option('--internal-shared-libs', action='store_true', default=True, dest='internal_shared_libs',
+                   help='Build internal libs as shared libraries')
+    opt.add_option('--internal-static-libs', action='store_false', dest='internal_shared_libs',
+                   help='Build internal libs as static libraries')
     opt.add_option('--videotimeline', action='store_true', default=False, dest='videotimeline',
                     help='Compile with support for video-timeline')
     opt.add_option('--lv2', action='store_true', default=True, dest='lv2',
@@ -571,6 +574,10 @@ def configure(conf):
         else:
             print ('No Carbon support available for this build\n')
 
+
+    if Options.options.internal_shared_libs: 
+        conf.define('INTERNAL_SHARED_LIBS', 1)
+
     if Options.options.boost_include != '':
         conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)
 
@@ -599,6 +606,7 @@ def configure(conf):
     autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18')
     autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2')
     autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0')
+    autowaf.check_pkg(conf, 'liblo', uselib_store='LO', atleast_version='0.26')
 
     conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL')
 
@@ -676,6 +684,7 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('Debuggable build',      conf.env['DEBUG'])
     write_config_text('Install prefix',        conf.env['PREFIX'])
     write_config_text('Strict compiler flags', conf.env['STRICT'])
+    write_config_text('Internal Shared Libraries', conf.is_defined('INTERNAL_SHARED_LIBS'))
 
     write_config_text('Architecture flags',    opts.arch)
     write_config_text('Aubio',                 conf.is_defined('HAVE_AUBIO'))