X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=boost.m4;h=cdf6c6418764464171792add2f4bfd0daeee4220;hb=0b7662be4e6c57b66352317ab7f097117888993a;hp=bd0ca60d6e2b557b812b52e055d5cbbd9f62a63b;hpb=28a21d8b7ba5c49c640cd8d1565e4641bce72797;p=m4-moved-to-github.git

diff --git a/boost.m4 b/boost.m4
index bd0ca60..cdf6c64 100644
--- a/boost.m4
+++ b/boost.m4
@@ -53,27 +53,35 @@ version_is:BOOST_VERSION
 	    for c in $1; do
 	    	case $c in 
 		    thread)
-			AC_SUBST([BOOST_THREAD_LIB])
-		        BOOST_THREAD_LIB="-lboost_thread-mt"
-		        LIBS="${LIBS} ${BOOST_THREAD_LIB}"
 			AC_MSG_CHECKING([Boost threads])
+			AC_SUBST([BOOST_THREAD_LIB])
+			saveLIBS="${LIBS}"
+			BOOST_THREAD_LIB=""
+			for l in boost_thread-mt boost_thread; do
+		            LIBS="${saveLIBS} -l${l}"
 			AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <boost/version.hpp>
 #include <boost/thread/thread.hpp>
 ]],[[ 
 int x = BOOST_VERSION;
-]])],[AC_MSG_RESULT([yes])],[
-AC_MSG_RESULT([no])
-AC_MSG_ERROR([Boost thread libraries required])
-			    ])
+]])],[
+			    BOOST_THREAD_LIB="-l${l}"
+			    break],[])
+			done
+			if test "${BOOST_THREAD_LIB}"; then
+			    AC_MSG_RESULT([yes])
+			else
+			    AC_MSG_RESULT([no])
+			fi
 			;;
 		    test)
-			AC_SUBST([BOOST_TEST_LIB])
-			saveLIBS="${LIBS}"
-			BOOST_TEST_LIB="-lboost_unit_test_framework-mt"
-			LIBS="${LIBS} ${BOOST_TEST_LIB}"
 			AC_MSG_CHECKING([Boost unit test framework])
-			AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+			saveLIBS="${LIBS}"
+			AC_SUBST([BOOST_TEST_LIB])
+			BOOST_TEST_LIB=""
+			for l in boost_unit_test_framework-mt boost_unit_test_framework; do
+			    LIBS="${saveLIBS} -l${l}"
+			    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 BOOST_AUTO_TEST_CASE( t ) 
@@ -81,8 +89,16 @@ BOOST_AUTO_TEST_CASE( t )
     BOOST_CHECK(1);
 }
 ]],[[ 
-]])],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([no])
-AC_MSG_ERROR([Boost unit test framework libraries required])])
+]])],[
+			      BOOST_TEST_LIB="-l${l}"
+			      break
+],[])
+			done
+			if test "${BOOST_TEST_LIB}"; then
+			    AC_MSG_RESULT([yes])
+			else
+			    AC_MSG_RESULT([no])
+			fi
 			LIBS="${saveLIBS}"
 			;;
 		esac