From 9f0af64963053a72d81757d6518502d47afc1b04 Mon Sep 17 00:00:00 2001
From: Latif Khalifa <latifer@streamgrid.net>
Date: Sun, 6 Oct 2013 01:55:12 +0200
Subject: [PATCH] More boosted fun

---
 indra/cmake/Boost.cmake | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 81ee24888..0cdae51bf 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -11,7 +11,6 @@ if (STANDALONE)
   find_package(Boost 1.40.0 COMPONENTS date_time filesystem program_options regex system thread wave)
 else (STANDALONE)
   use_prebuilt_binary(boost)
-  set(Boost_STATIC ON)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
   set(Boost_VERSION "1.52")
 
@@ -39,29 +38,29 @@ else (STANDALONE)
         debug libboost_thread-mt-gd)
   elseif (LINUX)
     set(Boost_CONTEXT_LIBRARY
-        optimized boost_context-mt
-        debug boost_context-mt-d)
+        optimized boost_context-mt.a
+        debug boost_context-mt-d.a)
     set(Boost_FILESYSTEM_LIBRARY
-        optimized boost_filesystem-mt
-        debug boost_filesystem-mt-d)
+        optimized boost_filesystem-mt.a
+        debug boost_filesystem-mt-d.a)
     set(Boost_PROGRAM_OPTIONS_LIBRARY
-        optimized boost_program_options-mt
-        debug boost_program_options-mt-d)
+        optimized boost_program_options-mt.a
+        debug boost_program_options-mt-d.a)
     set(Boost_REGEX_LIBRARY
-        optimized boost_regex-mt
-        debug boost_regex-mt-d)
+        optimized boost_regex-mt.a
+        debug boost_regex-mt-d.a)
     set(Boost_SIGNALS_LIBRARY
-        optimized boost_signals-mt
-        debug boost_signals-mt-d)
+        optimized boost_signals-mt.a
+        debug boost_signals-mt-d.a)
     set(Boost_SYSTEM_LIBRARY
-        optimized boost_system-mt
-        debug boost_system-mt-d)
+        optimized boost_system-mt.a
+        debug boost_system-mt-d.a)
     set(Boost_THREAD_LIBRARY
-        optimized boost_thread-mt
-        debug boost_thread-mt-d)
+        optimized boost_thread-mt.a
+        debug boost_thread-mt-d.a)
   elseif (DARWIN)
     set(Boost_CONTEXT_LIBRARY
-        optimized boost_context-mt
+        optimized boost_context-mtOA
         debug boost_context-mt-d)
     set(Boost_FILESYSTEM_LIBRARY
         optimized boost_filesystem-mt