Merge 1.0-encoding.

diff --git a/wscript b/wscript
index 54a1a3eb02cda64b49bc1b2f5a154324d193bcfb..a1ed6ec2354cf6be618323222bc098ce069d65be 100644 (file)
--- a/wscript
+++ b/wscript
@@ -196,6 +196,14 @@ def configure(conf):
                                 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