From 72eedf0b240c71b9dbd27d1f95b109b48e3200a2 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 26 Nov 2013 22:23:15 +0000
Subject: A whole load of UTF-8/-16 confusion fixes for Windows.

---
 src/lib/wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/wscript')

diff --git a/src/lib/wscript b/src/lib/wscript
index 852bb1aed..e317026f3 100644
--- 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_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_LOCALE
                  SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
                  CURL ZIP QUICKMAIL
                  """
-- 
cgit v1.2.3


From 52c7a765b76efbba439411a78ca31b72ef17fe6e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 27 Nov 2013 10:53:49 +0000
Subject: We only need boost locale on Windows.

---
 src/lib/util.cc |  2 ++
 src/lib/wscript |  4 ++--
 wscript         | 17 ++++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'src/lib/wscript')

diff --git a/src/lib/util.cc b/src/lib/util.cc
index e70440271..9dffffa98 100644
--- 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 e317026f3..5098d4069 100644
--- 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 138f947e4..54a1a3eb0 100644
--- 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
-- 
cgit v1.2.3