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

diff --git a/boost.m4 b/boost.m4
index 084e36e..cdf6c64 100644
--- a/boost.m4
+++ b/boost.m4
@@ -1,10 +1,20 @@
 # configure for Boost libs
 #
 # ID_BOOST([components],[libs])
+#
+# Sets the following variables:
+#
+#   BOOST_CPPFLAGS
+#   BOOST_LIB
+# If components include "thread":
+#   BOOST_THREAD_LIB
+# If components include "test":
+#   BOOST_TEST_LIB
+
 AC_DEFUN([ID_BOOST],
     [
-	AC_SUBST(BOOST_CPPFLAGS)
-	AC_SUBST(BOOST_LIB)
+	AC_SUBST([BOOST_CPPFLAGS])
+	AC_SUBST([BOOST_LIB])
 	
 	AC_MSG_CHECKING([for Boost])
 	AC_LANG_PUSH([C++])
@@ -26,50 +36,52 @@ AC_DEFUN([ID_BOOST],
 	else
 	    CPPFLAGS="${CPPFLAGS} ${BOOST_CPPFLAGS}"
 	    LIBS="${LIBS} ${BOOST_LIB}"
-            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+	    AC_LANG_CONFTEST(
+               [AC_LANG_SOURCE([[
 #include <boost/version.hpp>
-]],[[ 
-int x = BOOST_VERSION;
-]])],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([no])
-	    AC_MSG_ERROR([Boost development libraries required])
-])
-
-
-            AC_MSG_CHECKING([Boost version])
- 	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <boost/version.hpp>
-]],[[
-#if BOOST_VERSION < BOOST_REQ_VERSION
-#error Version too old
-#endif
-]])],[
-	    AC_MSG_RESULT([ok])
-],[
-	    AC_MSG_RESULT([version too old])
-	    AC_MSG_ERROR([A newer version of Boost is required])
-	])
-	fi
-	for c in $1; do
-	    case $c in 
-		thread)
-		    AC_SUBST(BOOST_THREAD_LIB)
-		    BOOST_THREAD_LIB="-lboost_thread"
-		    AC_MSG_CHECKING([Boost threads])
-		    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+version_is:BOOST_VERSION
+]])])
+	    BOOST_GOT_VERSION=`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | $EGREP version_is 2>/dev/null | cut -d ":" -f2`
+	    if test $BOOST_GOT_VERSION = "BOOST_VERSION"; then
+		AC_MSG_RESULT([no])
+		AC_MSG_ERROR([Boost development libraries required])
+	    fi
+	    AC_MSG_RESULT([yes ($BOOST_GOT_VERSION)])
+	    if test $BOOST_GOT_VERSION -lt $BOOST_REQ_VERSION; then
+		AC_MSG_ERROR([Boost version $BOOST_REQ_VERSION required])
+	    fi
+	    for c in $1; do
+	    	case $c in 
+		    thread)
+			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])
-])
-                    ;;
-		test)
-		    AC_SUBST(BOOST_TEST_LIB)
-		    BOOST_TEST_LIB="-lboost_unit_test_framework"
-		    AC_MSG_CHECKING([Boost unit test framework])
-		    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+]])],[
+			    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_MSG_CHECKING([Boost unit test framework])
+			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 ) 
@@ -77,11 +89,21 @@ 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
-	done
+	    done
+	fi
 	CPPFLAGS="$oldCPPFLAGS"
 	LIBS="$oldLIBS"
 	AC_LANG_POP([C++])