More build fixes.

diff --git a/src/lib/wscript b/src/lib/wscript
index b615b575d4c016c1410b421180ccd05dd580bc7d..3daf3ecf4b667d182b96a79002c51f849f7a0292 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -143,7 +143,7 @@ def build(bld):
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
                  SNDFILE SAMPLERATE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
-                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB UCHARDET
+                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU
                  """
 
     if bld.env.TARGET_OSX:

diff --git a/src/tools/wscript b/src/tools/wscript
index b01eee7ca1c91bac55ca411838161e2958cc1251..72d8ac9a80a225494e8f3a868f79ff99fa743633 100644 (file)
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -29,7 +29,7 @@ def configure(conf):
 def build(bld):
     uselib =  'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC '
     uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB MAGICK SNDFILE SAMPLERATE BOOST_REGEX '
-    uselib += 'UCHARDET '
+    uselib += 'ICU '
 
     if bld.env.TARGET_WINDOWS:
         uselib += 'WINSOCK2'

diff --git a/test/wscript b/test/wscript
index a92e344eb9b2ed9f1eeffec79cedc40d6a337dc4..6ee995e36c114de49a6eb77fd2bdf1c6d069769b 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -31,7 +31,7 @@ def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'unit-tests'
     obj.uselib =  'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP OPENJPEG FONTCONFIG CAIROMM PANGOMM XMLPP '
-    obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB GLIB CURL SSH XMLSEC BOOST_REGEX UCHARDET '
+    obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU '
     if bld.env.TARGET_WINDOWS:
         obj.uselib += 'WINSOCK2'
     obj.use    = 'libdcpomatic2'

diff --git a/wscript b/wscript
index 245f3353c1c03cc55bc2eaab23244e76db48a486..22ec79c2629def8d572a8e579f28c9ea1fb8e72f 100644 (file)
--- a/wscript
+++ b/wscript
@@ -159,6 +159,9 @@ def configure(conf):
     else:
         conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True)
 
+    # libicu
+    conf.check_cfg(package='icu-io', args='--cflags --libs', uselib_store='ICU', mandatory=True)
+
     # libsndfile
     conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True)