1 files changed, 20 insertions, 6 deletions

diff --git a/boost.pri b/boost.pri
index 46cbb83..c2f5d8e 100644
--- a/boost.pri
+++ b/boost.pri
@@ -9,18 +9,32 @@ boost {
     win32:QMAKE_LIBDIR += -L$$BOOST_DIR/lib
   }
 
+  win32:!CONFIG(mingw-cross-env) {
+    LIBS += -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1
+  } 
+
   CONFIG(mingw-cross-env) {
     DEFINES += BOOST_STATIC
     DEFINES += BOOST_THREAD_USE_LIB
     DEFINES += Boost_USE_STATIC_LIBS
     LIBS += -lboost_thread_win32-mt -lboost_program_options-mt
-  } else {
-    win32 {
-      LIBS += -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1
-    } else {
-      # some platforms have only '-mt' versions. uncomment if needed. 
-      # LIBS += -lboost_thread-mt -lboost_program_options-mt
+  } 
+
+  unix {
+    BMT_TEST1 = /usr/lib64/libboost*thread-mt*
+    BMT_TEST2 = /usr/lib/libboost*thread-mt*
+    BMT_TEST3 = $$BOOST_DIR/lib/libboost*thread-mt*
+
+    exists($$BMT_TEST1)|exists($$BMT_TEST2)|exists($$BMT_TEST3) {
+      LIBS += -lboost_thread-mt -lboost_program_options-mt
+      BOOST_IS_MT = true
+    } 
+  }
+
+  unix|macx {
+    isEmpty(BOOST_IS_MT) { 
       LIBS += -lboost_thread -lboost_program_options
     }
   }
+
 }