X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=9c1b60865ff97e4438cc07b29e19f48c119f1b8e;hb=12e20e180062dbc338e775bd1f5ec7a2af91df7f;hp=fd10b13fa05ab87be012d2aaa4c61c999bd180cd;hpb=757b0ddcb376b3ed8265b3457a8b1adefa7b649e;p=dcpomatic.git

diff --git a/wscript b/wscript
index fd10b13fa..9c1b60865 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.1.13devel'
+VERSION = '2.1.22devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -227,11 +227,11 @@ def configure(conf):
 
     # libsub
     if conf.options.static_sub:
-        conf.check_cfg(package='libsub-1.0', atleast_version='1.1.0', args='--cflags', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.1.0', args='--cflags', uselib_store='SUB', mandatory=True)
         conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
         conf.env.STLIB_SUB = ['sub-1.0']
     else:
-        conf.check_cfg(package='libsub-1.0', atleast_version='1.1.0', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.1.0', args='--cflags --libs', uselib_store='SUB', mandatory=True)
         conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
 
     # libxml++
@@ -295,6 +295,7 @@ def configure(conf):
         conf.env.STLIB_BOOST_DATETIME = ['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix]
         conf.env.STLIB_BOOST_SIGNALS2 = ['boost_signals2']
         conf.env.STLIB_BOOST_SYSTEM = ['boost_system']
+        conf.env.STLIB_BOOST_REGEX = ['boost_regex']
     else:
         conf.check_cxx(fragment="""
                             #include <boost/version.hpp>\n
@@ -342,6 +343,14 @@ def configure(conf):
                        msg='Checking for boost signals2 library',
                        uselib_store='BOOST_SIGNALS2')
 
+        conf.check_cxx(fragment="""
+    			    #include <boost/regex.hpp>\n
+    			    int main() { boost::regex re ("foo"); }\n
+			    """,
+                       msg='Checking for boost regex library',
+                       lib=['boost_regex%s' % boost_lib_suffix],
+                       uselib_store='BOOST_REGEX')
+
     # Other stuff
 
     conf.find_program('msgfmt', var='MSGFMT')