X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=afc06fd524800dae3d78b6662257faeba7c17ed8;hb=92023f3a3b8c3b9af96473f54c674b61a8df6d59;hp=da334e8e871987082bfca08602c3978b14a0c130;hpb=753912e0f4a70343b693b1b5aefff101edd28874;p=libdcp.git

diff --git a/wscript b/wscript
index da334e8e..afc06fd5 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import lut
 
 APPNAME = 'libdcp'
-VERSION = '0.09pre'
+VERSION = '0.31pre'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -15,13 +15,14 @@ def configure(conf):
     conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-Wno-unused-result', '-O2', '-D_FILE_OFFSET_BITS=64'])
     conf.env.append_value('CXXFLAGS', ['-DLIBDCP_VERSION="%s"' % VERSION])
 
+    conf.env.TARGET_WINDOWS = conf.options.target_windows
+
     if conf.options.target_windows:
         conf.env.append_value('CXXFLAGS', '-DLIBDCP_WINDOWS')
     else:
         conf.env.append_value('CXXFLAGS', '-DLIBDCP_POSIX')
 
     conf.check_cfg(package = 'openssl', args = '--cflags --libs', uselib_store = 'OPENSSL', mandatory = True)
-    conf.check_cfg(package = 'sigc++-2.0', args = '--cflags --libs', uselib_store = 'SIGC++', mandatory = True)
     conf.check_cfg(package = 'libxml++-2.6', args = '--cflags --libs', uselib_store = 'LIBXML++', mandatory = True)
 
     conf.check_cc(fragment  = """
@@ -52,6 +53,13 @@ def configure(conf):
                    lib = ['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                    uselib_store = 'BOOST_FILESYSTEM')
 
+    conf.check_cxx(fragment = """
+    			      #include <boost/signals2.hpp>\n
+    			      int main() { boost::signals2::signal<void (int)> x; }\n
+			      """,
+                   msg = 'Checking for boost signals2 library',
+                   uselib_store = 'BOOST_SIGNALS2')
+
     lut.make_luts()
 
     conf.recurse('test')
@@ -60,16 +68,24 @@ def configure(conf):
 def build(bld):
     create_version_cc(VERSION)
 
+    if bld.env.TARGET_WINDOWS:
+        boost_lib_suffix = '-mt'
+    else:
+        boost_lib_suffix = ''
+
     bld(source = 'libdcp.pc.in',
         version = VERSION,
         includedir = '%s/include' % bld.env.PREFIX,
-        libs = "-L${libdir} -ldcp -lkumu-libdcp -lasdcp-libdcp",
+        libs = "-L${libdir} -ldcp -lkumu-libdcp -lasdcp-libdcp -lboost_system%s" % boost_lib_suffix,
         install_path = '${LIBDIR}/pkgconfig')
 
     bld.recurse('src')
     bld.recurse('tools')
     bld.recurse('test')
     bld.recurse('asdcplib')
+    bld.recurse('examples')
+
+    bld.add_post_fun(post)
 
 def dist(ctx):
     ctx.excl = 'TODO core *~ .git build .waf* .lock* doc/*~ src/*~ test/ref/*~'
@@ -94,3 +110,7 @@ def create_version_cc(version):
     except IOError:
         print('Could not open src/version.cc for writing\n')
         sys.exit(-1)
+
+def post(ctx):
+    if ctx.cmd == 'install':
+        ctx.exec_command('/sbin/ldconfig')