X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=boost.m4;h=e66a6372dc470fe95ed10f3fb1b1eda85b70e918;hb=9582607a1a4c2c45046c16c1e6a1b9ae204e2a66;hp=0540465f0ea9c59ae1fbd8ee236b6e05ffc8de9c;hpb=4f4f4349139aad0bc00bd62c4ea4ab4239f34af4;p=m4-moved-to-github.git

diff --git a/boost.m4 b/boost.m4
index 0540465..e66a637 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
@@ -100,6 +108,7 @@ int x = BOOST_VERSION;
 			    AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #define BOOST_TEST_DYN_LINK
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MODULE configure
 #include <boost/test/auto_unit_test.hpp>
 BOOST_AUTO_TEST_CASE( t ) 
 {
@@ -117,6 +126,28 @@ BOOST_AUTO_TEST_CASE( t )
 			fi
 			LIBS="${saveLIBS}"
 			;;
+		    regex)
+			AC_MSG_CHECKING([Boost regex])
+			AC_SUBST([BOOST_REGEX_LIB])
+			saveLIBS="${LIBS}"
+			BOOST_REGEX_LIB=""
+			for l in boost_regex${BOOST_TOOLSET}-mt boost_regex${BOOST_TOOLSET}; do
+		            LIBS="${saveLIBS} -l${l}"
+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <boost/version.hpp>
+#include <boost/regex.hpp>
+]],[[ 
+int x = BOOST_VERSION;
+]])],[
+			    BOOST_REGEX_LIB="-l${l}"
+			    break],[])
+			done
+			if test "${BOOST_REGEX_LIB}"; then
+			    AC_MSG_RESULT([yes])
+			else
+			    AC_MSG_RESULT([no])
+			fi
+			;;
 		esac
 	    done
 	fi