Remove now-unused boost regex.

diff --git a/examples/wscript b/examples/wscript
index 46ee6c5ab981c90e54a0c02112c4116af9067ea5..a71a215b660d6e5343f87c69e92c55259f69430c 100644 (file)
--- a/examples/wscript
+++ b/examples/wscript
@@ -20,7 +20,7 @@ def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'make_dcp'
     obj.use    = 'libdcp%s' % bld.env.API_VERSION
-    obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM BOOST_REGEX'
+    obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM'
     obj.source = 'make_dcp.cc'
     obj.target = 'make_dcp'
     obj.install_path = ''
@@ -28,7 +28,7 @@ def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'read_dcp'
     obj.use    = 'libdcp%s' % bld.env.API_VERSION
-    obj.uselib = 'OPENJPEG CXML MAGICK OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM BOOST_REGEX'
+    obj.uselib = 'OPENJPEG CXML MAGICK OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM'
     obj.source = 'read_dcp.cc'
     obj.target = 'read_dcp'
     obj.install_path = ''

diff --git a/src/verify.cc b/src/verify.cc
index cb2b12872d75a7630a9b96f56563af1906e8ddd7..6684eac62847c0c2a279f03b76031dc097fe1527 100644 (file)
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -60,7 +60,6 @@
 #include <boost/noncopyable.hpp>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/regex.hpp>
 #include <map>
 #include <list>
 #include <vector>

diff --git a/test/wscript b/test/wscript
index ba2d3092ef6c4a07ccfc01b6eab6c7de6f2ba1e1..ef97a849371b5b1cfff1951171cd306c9bead705 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -51,7 +51,7 @@ def configure(conf):
 def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'tests'
-    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME BOOST_REGEX OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCPLIB_CTH LIBXML++ OPENSSL'
+    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCPLIB_CTH LIBXML++ OPENSSL'
     obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
     if bld.is_defined('HAVE_GCOV'):
         obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION
@@ -106,7 +106,7 @@ def build(bld):
 
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'subs_in_out'
-    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_REGEX OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL'
+    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL'
     obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
     if bld.is_defined('HAVE_GCOV'):
         obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION
@@ -121,7 +121,7 @@ def build(bld):
 
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'rewrite_subs'
-    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_REGEX OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL'
+    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL'
     obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
     if bld.is_defined('HAVE_GCOV'):
         obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION
@@ -136,7 +136,7 @@ def build(bld):
 
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'bench'
-    obj.uselib = 'BOOST_FILESYSTEM BOOST_REGEX OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL LIBXML++'
+    obj.uselib = 'BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL LIBXML++'
     obj.use = 'libdcp%s' % bld.env.API_VERSION
     obj.source = 'bench.cc'
     obj.target = 'bench'

diff --git a/tools/wscript b/tools/wscript
index 0016848909c14f798c72bd1db2c06282e9a89143..912a775008fa2085aadc4835fd29dee6674e8981 100644 (file)
--- a/tools/wscript
+++ b/tools/wscript
@@ -34,19 +34,19 @@
 def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.use = ['libdcp%s' % bld.env.API_VERSION]
-    obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM BOOST_REGEX LIBXML++ XMLSEC1 OPENSSL XERCES'
+    obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL XERCES'
     obj.source = 'dcpdiff.cc common.cc'
     obj.target = 'dcpdiff'
 
     obj = bld(features='cxx cxxprogram')
     obj.use = ['libdcp%s' % bld.env.API_VERSION]
-    obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM BOOST_REGEX LIBXML++ XMLSEC1 OPENSSL XERCES'
+    obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL XERCES'
     obj.source = 'dcpinfo.cc common.cc'
     obj.target = 'dcpinfo'
 
     for f in ['dumpsub', 'decryptmxf', 'kdm', 'thumb', 'recover', 'verify']:
         obj = bld(features='cxx cxxprogram')
         obj.use = ['libdcp%s' % bld.env.API_VERSION]
-        obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM BOOST_REGEX LIBXML++ XMLSEC1 OPENSSL XERCES '
+        obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL XERCES '
         obj.source = 'dcp%s.cc' % f
         obj.target = 'dcp%s' % f

diff --git a/wscript b/wscript
index 1785b893cdd0be8b5e3218c98a625deb142591c0..425efa103dbc985cd43bfce453ae97bc6894655f 100644 (file)
--- a/wscript
+++ b/wscript
@@ -197,15 +197,6 @@ def configure(conf):
                    lib=['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                    uselib_store='BOOST_DATETIME')
 
-    conf.check_cxx(fragment="""
-                           #include <boost/regex.hpp>\n
-                           int main() { boost::regex ex("a"); }\n
-                           """,
-                   msg='Checking for boost regex library',
-                   libpath='/usr/local/lib',
-                   lib=['boost_regex%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
-                   uselib_store='BOOST_REGEX')
-
     if not conf.env.DISABLE_TESTS:
         conf.recurse('test')
         if not conf.options.disable_gcov: