jepler/povray
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13 from yoe/master

Browse source 
Unix build process now automatically detects whether -lboost_thread requires -lboost_system to work. (Thanks to Wouter "yoe" Verhelst for the fix.)
This commit is contained in:
c-lipka 2013-12-05 23:13:27 -08:00
commit 227c801ddb
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
unix/configure.ac
View file

@ -308,18 +308,30 @@ else
LIBS="$BOOST_THREAD_LIB $LIBS" LIBS="$BOOST_THREAD_LIB $LIBS"
fi fi
AC_MSG_CHECKING([whether the boost thread library is usable]) AC_MSG_CHECKING([whether the boost thread library is usable])
SAVED_LIBS=$LIBS
boost_thread_links=0
for extralib in '' '-lboost_system'
do
LIBS=$SAVED_LIBS
LIBS="$LIBS $extralib"
AC_RUN_IFELSE( AC_RUN_IFELSE(
[AC_LANG_PROGRAM([[ [AC_LANG_PROGRAM([[
#include <boost/thread/thread.hpp> #include <boost/thread/thread.hpp>
]], ]],
[[boost::defer_lock_t(); return 0;]])], [[boost::defer_lock_t(); return 0;]])],
[AC_MSG_RESULT([yes])],
[ [
AC_MSG_RESULT([no]) AC_MSG_RESULT([yes])
AC_MSG_FAILURE([cannot link with the boost thread library]) BOOST_THREAD_LIB="$BOOST_THREAD_LIB $extralib"
], boost_thread_links=1
],,
[AC_MSG_RESULT([cross-compiling])] # FIXME [AC_MSG_RESULT([cross-compiling])] # FIXME
) )
done
if test $boost_thread_links != '1'; then
AC_MSG_RESULT([no])
AC_MSG_FAILURE([cannot link with the boost thread library])
fi
AC_DEFINE([USE_OFFICIAL_BOOST], [], [Use the official Boost libraries.]) AC_DEFINE([USE_OFFICIAL_BOOST], [], [Use the official Boost libraries.])
# Intel Math Kernel library # Intel Math Kernel library