X-Git-Url: http://git.indexdata.com/?p=m4-moved-to-github.git;a=blobdiff_plain;f=boost.m4;h=3ef2e7e435498250d01502a6e27492e7ed2585f7;hp=d2dd7041f947dba2aa136aa2802f12824ef6b8c6;hb=12f3277de6a4c46c27835d45890ab1732e3dab81;hpb=374a6b4fe5d08e5152fd71e0803541884ea60e0f

diff --git a/boost.m4 b/boost.m4
index d2dd704..3ef2e7e 100644
--- 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
@@ -99,8 +107,9 @@ int x = BOOST_VERSION;
 			    LIBS="${saveLIBS} -l${l}"
 			    AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #define BOOST_TEST_DYN_LINK
+#define BOOST_AUTO_TEST_MAIN
 #define BOOST_TEST_MODULE configure
-#include <boost/test/unit_test.hpp>
+#include <boost/test/auto_unit_test.hpp>
 BOOST_AUTO_TEST_CASE( t ) 
 {
     BOOST_CHECK(1);