Stop using pkgconfig

7 files changed, 12 insertions, 13 deletions

diff --git a/benchmark/wscript b/benchmark/wscript
index 7097a762..b14e1084 100644
--- a/benchmark/wscript
+++ b/benchmark/wscript
@@ -35,7 +35,7 @@ def build(bld):
     for p in ['rgb_to_xyz', 'j2k_transcode']:
         obj = bld(features='cxx cxxprogram')
         obj.name = p
-        obj.uselib = 'BOOST_FILESYSTEM ASDCPLIB_CTH CXML'
+        obj.uselib = 'BOOST_FILESYSTEM ASDCP KUMU CXML'
         obj.cppflags = ['-g', '-O2']
         obj.use = 'libdcp%s' % bld.env.API_VERSION
         obj.source = "%s.cc" % p
diff --git a/examples/wscript b/examples/wscript
index d062af1b..48bb1ed7 100644
--- a/examples/wscript
+++ b/examples/wscript
@@ -21,7 +21,7 @@ def build(bld):
         obj = bld(features='cxx cxxprogram')
         obj.name   = example
         obj.use    = 'libdcp%s' % bld.env.API_VERSION
-        obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM OPENSSL XMLSEC1 MAGICK'
+        obj.uselib = 'OPENJPEG CXML OPENMP ASDCP KUMU BOOST_FILESYSTEM OPENSSL XMLSEC1 MAGICK'
         obj.source = example + '.cc'
         obj.target = example
         obj.install_path = ''
diff --git a/libdcp-1.0.pc.in b/libdcp-1.0.pc.in
index a5e12bde..d2d4aa2b 100644
--- a/libdcp-1.0.pc.in
+++ b/libdcp-1.0.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@
 Name: libdcp
 Description: DCP reading and writing library
 Version: @version@
-Requires: sigc++-2.0 openssl libxml++-2.6 xmlsec1 libasdcp-carl xerces-c
+Requires: sigc++-2.0 openssl libxml++-2.6 xmlsec1 xerces-c
 Libs: @libs@
 Cflags: -I${includedir}
diff --git a/src/wscript b/src/wscript
index 39e3351d..9c3f2e78 100644
--- a/src/wscript
+++ b/src/wscript
@@ -232,7 +232,7 @@ def build(bld):
     obj.name = 'libdcp%s' % bld.env.API_VERSION
     obj.target = 'dcp%s' % bld.env.API_VERSION
     obj.export_includes = ['.']
-    obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1 ASDCPLIB_CTH XERCES'
+    obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1 ASDCP KUMU XERCES'
     obj.source = source
 
     # Library for gcov
@@ -244,7 +244,7 @@ def build(bld):
         obj.name = 'libdcp%s_gcov' % bld.env.API_VERSION
         obj.target = 'dcp%s_gcov' % bld.env.API_VERSION
         obj.export_includes = ['.']
-        obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1 ASDCPLIB_CTH XERCES'
+        obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1 ASDCP KUMU XERCES'
         obj.use = 'libkumu-libdcp%s libasdcp-libdcp%s' % (bld.env.API_VERSION, bld.env.API_VERSION)
         obj.source = source
         obj.cppflags = ['-fprofile-arcs', '-ftest-coverage', '-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
diff --git a/test/wscript b/test/wscript
index b6cec631..85e3df13 100644
--- a/test/wscript
+++ b/test/wscript
@@ -53,7 +53,7 @@ def configure(conf):
 def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'tests'
-    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCPLIB_CTH LIBXML++ OPENSSL XERCES DL'
+    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCP KUMU LIBXML++ OPENSSL XERCES DL'
     obj.cppflags = ['-fno-inline', '-fno-elide-constructors', '-g', '-O0']
     if bld.env['CXX_NAME'] == 'gcc':
         obj.cppflags.append('-fno-default-inline')
@@ -118,7 +118,7 @@ def build(bld):
 
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'subs_in_out'
-    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL DL LIBXML++'
+    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCP KUMU XMLSEC1 OPENSSL DL LIBXML++'
     obj.cppflags = ['-fno-inline', '-fno-elide-constructors', '-g', '-O0']
     if bld.env['CXX_NAME'] == 'gcc':
         obj.cppflags.append('-fno-default-inline')
@@ -135,7 +135,7 @@ def build(bld):
 
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'rewrite_subs'
-    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL DL LIBXML++'
+    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCP KUMU XMLSEC1 OPENSSL DL LIBXML++'
     obj.cppflags = ['-fno-inline', '-fno-elide-constructors', '-g', '-O0']
     if bld.env['CXX_NAME'] == 'gcc':
         obj.cppflags.append('-fno-default-inline')
diff --git a/tools/wscript b/tools/wscript
index 2e0d2761..87bf83cf 100644
--- a/tools/wscript
+++ b/tools/wscript
@@ -32,7 +32,7 @@
 #
 
 def build(bld):
-    uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL XERCES DL'
+    uselib = 'OPENJPEG CXML OPENMP ASDCP KUMU BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL XERCES DL'
 
     obj = bld(features='cxx cxxprogram')
     obj.use = ['libdcp%s' % bld.env.API_VERSION]
diff --git a/wscript b/wscript
index ae73448d..fafd8aea 100644
--- a/wscript
+++ b/wscript
@@ -150,16 +150,12 @@ def configure(conf):
 
     if conf.options.static:
         conf.env.STLIB_OPENJPEG = ['openjp2']
-        conf.check_cfg(package='libasdcp-carl', args='libasdcp-carl >= 0.1.3 --cflags', uselib_store='ASDCPLIB_CTH', mandatory=True)
-        conf.env.HAVE_ASDCPLIB_CTH = 1
-        conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-carl', 'kumu-carl']
         conf.env.HAVE_CXML = 1
         conf.env.LIB_CXML = ['xml++-2.6', 'glibmm-2.4']
         conf.env.STLIB_CXML = ['cxml']
         conf.check_cfg(package='xerces-c', args='--cflags', uselib_store='XERCES', mandatory=True)
         conf.env.LIB_XERCES = ['xerces-c', 'icuuc', 'curl']
     else:
-        conf.check_cfg(package='libasdcp-carl', args='libasdcp-carl >= 0.1.3 --cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True)
         conf.check_cfg(package='libcxml', args='libcxml >= 0.17.0 --cflags --libs', uselib_store='CXML', mandatory=True)
         conf.check_cfg(package='xerces-c', args='--cflags --libs', uselib_store='XERCES', mandatory=True)
 
@@ -168,6 +164,9 @@ def configure(conf):
         conf.env.LIB_XERCES.append('curl')
         conf.env.LIB_XERCES.append('ws2_32')
 
+    conf.check(lib='asdcp', uselib_store='ASDCP', msg='Checking for library asdcplib')
+    conf.check(lib='kumu', uselib_store='KUMU', msg='Checking for library kumu')
+
     if conf.options.target_windows_64:
         boost_lib_suffix = '-mt-x64'
     elif conf.options.target_windows_32: