Quoting fix for boost thread check

[m4-moved-to-github.git] / boost.m4

diff --git a/boost.m4 b/boost.m4
index b667071..3ef2e7e 100644 (file)
--- a/boost.m4
+++ b/boost.m4
@@ -69,19 +69,27 @@ version_is:BOOST_VERSION
            for c in $1; do
                case $c in 
                    thread)
-                       AC_MSG_CHECKING([Boost threads])
+                       if test "$BOOST_GOT_VERSION" -ge 104100; then
+                           AC_MSG_CHECKING([Boost threads + system])
+                       else
+                           AC_MSG_CHECKING([Boost threads])
+                       fi
                        AC_SUBST([BOOST_THREAD_LIB])
                        saveLIBS="${LIBS}"
                        BOOST_THREAD_LIB=""
-                       for l in boost_thread${BOOST_TOOLSET}-mt boost_thread${BOOST_TOOLSET}; do
-                           LIBS="${saveLIBS} -l${l}"
+                       for l in "${BOOST_TOOLSET}-mt" "${BOOST_TOOLSET}"; do
+                           trylib="-lboost_thread${l}"
+                           if test "$BOOST_GOT_VERSION" -ge 104100; then
+                               trylib="-lboost_system${l} ${trylib}"
+                           fi
+                           LIBS="${saveLIBS} ${trylib}"
                        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <boost/version.hpp>
 #include <boost/thread/thread.hpp>
 ]],[[ 
 int x = BOOST_VERSION;
 ]])],[
-                           BOOST_THREAD_LIB="-l${l}"
+                           BOOST_THREAD_LIB="${trylib}"
                            break],[])
                        done
                        if test "${BOOST_THREAD_LIB}"; then