From 6240d7208a43d012f6c928f738c958122996dbf1 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 21 Aug 2013 12:58:35 +0200 Subject: [PATCH] Pick non-mt suffix libs first MP-475 --- boost.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/boost.m4 b/boost.m4 index 38060ca..e73b7af 100644 --- a/boost.m4 +++ b/boost.m4 @@ -74,7 +74,7 @@ version_is:BOOST_VERSION if test "$BOOST_GOT_VERSION" -ge 104100; then AC_MSG_CHECKING([Boost system]) saveLIBS="${LIBS}" - for l in "${BOOST_TOOLSET}-mt" "${BOOST_TOOLSET}"; do + for l in "${BOOST_TOOLSET}" "${BOOST_TOOLSET}-mt"; do trylib="-lboost_system${l}" LIBS="${saveLIBS} ${trylib}" AC_LINK_IFELSE([AC_LANG_PROGRAM([[ @@ -99,7 +99,7 @@ int x = BOOST_VERSION; AC_SUBST([BOOST_THREAD_LIB]) saveLIBS="${LIBS}" BOOST_THREAD_LIB="" - for l in "${BOOST_TOOLSET}-mt" "${BOOST_TOOLSET}"; do + for l in "${BOOST_TOOLSET}" "${BOOST_TOOLSET}-mt"; do trylib="-lboost_thread${l}" LIBS="${saveLIBS} ${trylib}" AC_LINK_IFELSE([AC_LANG_PROGRAM([[ @@ -123,7 +123,7 @@ int x = BOOST_VERSION; saveLIBS="${LIBS}" AC_SUBST([BOOST_TEST_LIB]) BOOST_TEST_LIB="" - for l in boost_unit_test_framework${BOOST_TOOLSET}-mt boost_unit_test_framework${BOOST_TOOLSET}; do + for l in boost_unit_test_framework${BOOST_TOOLSET} boost_unit_test_framework${BOOST_TOOLSET}-mt; do LIBS="${saveLIBS} -l${l}" AC_LINK_IFELSE([AC_LANG_SOURCE([[ #define BOOST_TEST_DYN_LINK @@ -151,7 +151,7 @@ BOOST_AUTO_TEST_CASE( t ) AC_SUBST([BOOST_REGEX_LIB]) saveLIBS="${LIBS}" BOOST_REGEX_LIB="" - for l in boost_regex${BOOST_TOOLSET}-mt boost_regex${BOOST_TOOLSET}; do + for l in boost_regex${BOOST_TOOLSET} boost_regex${BOOST_TOOLSET}-mt; do LIBS="${saveLIBS} -l${l}" AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include -- 1.7.10.4