X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=2f9388a1525dbd133599fc406a7d6fc3bb5c99b4;hb=04ae4d393603da286d78a72c4f60c545c03b35e8;hp=b5900a24e5b55446d248863425077e6085a1fd6f;hpb=1371039e41d4120a5d1aad4b9c0ce00ea710789d;p=libsub.git

diff --git a/wscript b/wscript
index b5900a2..2f9388a 100644
--- a/wscript
+++ b/wscript
@@ -1,8 +1,9 @@
 import subprocess
 import os
+from waflib import Context
 
 APPNAME = 'libsub'
-VERSION = '1.1.6devel'
+VERSION = '1.2.4devel'
 API_VERSION = '-1.0'
 
 def options(opt):
@@ -28,15 +29,25 @@ def configure(conf):
     else:
         conf.env.append_value('CXXFLAGS', '-O3')
 
+    # Disable libxml++ deprecation warnings for now
+    conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-declarations'])
+
     conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
 
     if conf.options.static:
+        conf.check_cfg(package='libcxml', atleast_version='0.14.0', args='--cflags', uselib_store='CXML', mandatory=True)
         conf.env.HAVE_CXML = 1
         conf.env.LIB_CXML = ['glibmm-2.4', 'glib-2.0', 'pcre', 'sigc-2.0', 'rt', 'xml++-2.6', 'xml2', 'pthread', 'lzma', 'dl', 'z']
         conf.env.STLIB_CXML = ['cxml']
-        conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.4.4', args='--cflags', uselib_store='DCP', mandatory=True)
+        conf.env.HAVE_DCP = 1
+        conf.env.STLIB_DCP = ['dcp-1.0']
+        conf.env.LIB_DCP = ['ssl', 'crypto']
     else:
-        conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.15.2', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.4.4', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+
+    conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
 
     boost_lib_suffix = ''
     if conf.env.TARGET_WINDOWS:
@@ -83,7 +94,13 @@ def configure(conf):
 
     if not conf.env.DISABLE_TESTS:
         conf.recurse('test')
-    conf.recurse('asdcplib')
+
+    # libxml++ 2.39.1 and later must be built with -std=c++11
+    libxmlpp_version = conf.cmd_and_log(['pkg-config', '--modversion', 'libxml++-2.6'], output=Context.STDOUT, quiet=Context.BOTH)
+    s = libxmlpp_version.split('.')
+    v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2])
+    if v >= 0x022701:
+        conf.env.append_value('CXXFLAGS', '-std=c++11')
 
 def build(bld):
     create_version_cc(bld, VERSION)
@@ -96,14 +113,13 @@ def build(bld):
     bld(source='libsub%s.pc.in' % bld.env.API_VERSION,
         version=VERSION,
         includedir='%s/include/libsub%s' % (bld.env.PREFIX, bld.env.API_VERSION),
-        libs="-L${libdir} -lsub%s -lasdcp-libsub%s -lkumu-libsub%s -lboost_system%s" % (bld.env.API_VERSION, bld.env.API_VERSION, bld.env.API_VERSION, boost_lib_suffix),
+        libs="-L${libdir} -lsub%s -lboost_system%s" % (bld.env.API_VERSION, boost_lib_suffix),
         install_path='${LIBDIR}/pkgconfig')
 
     bld.recurse('src')
     if not bld.env.DISABLE_TESTS:
         bld.recurse('test')
     bld.recurse('tools')
-    bld.recurse('asdcplib')
 
     bld.add_post_fun(post)
 
@@ -139,3 +155,6 @@ def create_version_cc(bld, version):
 def post(ctx):
     if ctx.cmd == 'install':
         ctx.exec_command('/sbin/ldconfig')
+
+def tags(bld):
+    os.system('etags src/*.cc src/*.h')