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
+ if test -z "$BOOST_GOT_VERSION" -o \
+ "$BOOST_GOT_VERSION" = "BOOST_VERSION"; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([Boost development libraries required])
fi
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
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 )
{
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