Merge 1.0-encoding.

diff --cc wscript
index 54a1a3eb02cda64b49bc1b2f5a154324d193bcfb,138f947e4c5b16e0927b67d31b5585ca4065519c..a1ed6ec2354cf6be618323222bc098ce069d65be
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -185,17 -185,14 +185,25 @@@ def configure(conf)
                              lib=['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                              uselib_store='BOOST_DATETIME')
  
 +    # 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/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
                            int main() { boost::signals2::signal<void (int)> x; }\n