From fcb8b5131df5bf02966441076c2131b73a3f61ed Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 27 Nov 2013 16:03:57 +0000
Subject: Fix bad merge.

---
 wscript | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'wscript')

diff --git a/wscript b/wscript
index 32aa591b6..bb7558c43 100644
--- a/wscript
+++ b/wscript
@@ -196,14 +196,6 @@ 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
-- 
cgit v1.2.3