We only need boost locale on Windows.

diff --git a/src/lib/util.cc b/src/lib/util.cc
index e7044027155715f2910dd4762d7e94b9b99d5081..9dffffa9865b033cb190a5ec1ddffcb2a65a56ad 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -39,7 +39,9 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
+#ifdef DCPOMATIC_WINDOWS
 #include <boost/locale.hpp>
+#endif
 #include <glib.h>
 #include <openjpeg.h>
 #include <openssl/md5.h>

diff --git a/src/lib/wscript b/src/lib/wscript
index e317026f3e7aadf8157195dc5243895dde614fe1..5098d406927d895513af5f5c5ce513ae95d383e5 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -74,7 +74,7 @@ def build(bld):
     obj.export_includes = ['..']
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
-                 BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_LOCALE
+                 BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
                  SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
                  CURL ZIP QUICKMAIL
                  """
@@ -82,7 +82,7 @@ def build(bld):
     obj.source = sources + ' version.cc'
 
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK'
+        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE'
         obj.source += ' stack.cpp'
     if bld.env.STATIC:
         obj.uselib += ' XML++'

diff --git a/wscript b/wscript
index 138f947e4c5b16e0927b67d31b5585ca4065519c..54a1a3eb02cda64b49bc1b2f5a154324d193bcfb 100644 (file)
--- a/wscript
+++ b/wscript
@@ -185,13 +185,16 @@ 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/locale.hpp>\n
-                           int main() { std::locale::global (boost::locale::generator().generate ("")); }\n
-                           """, msg='Checking for boost locale library',
-                            libpath='/usr/local/lib',
-                            lib=['boost_locale%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
-                            uselib_store='BOOST_LOCALE')
+    # Only Windows versions require boost::locale, which is handy, as it was only introduced in
+    # boost 1.48 and so isn't (easily) available on old Ubuntus.
+    if conf.env.TARGET_WINDOWS:
+        conf.check_cxx(fragment="""
+                               #include <boost/locale.hpp>\n
+                               int main() { std::locale::global (boost::locale::generator().generate ("")); }\n
+                               """, msg='Checking for boost locale library',
+                                libpath='/usr/local/lib',
+                                lib=['boost_locale%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
+                                uselib_store='BOOST_LOCALE')
 
     conf.check_cxx(fragment="""
                            #include <boost/signals2.hpp>\n