diff options
| author | Thomas Porschberg <thomas@randspringer.de> | 2007-11-22 21:44:27 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2007-11-22 21:44:27 +0100 |
| commit | 09c7b008f3b6e5631afe10e1eebc09ac0ff32223 (patch) | |
| tree | 801ecb0103eea4c183af99fcd472cc6fad0fe769 /m4/ax_boost_thread.m4 | |
| parent | a5886ddebcb40686a10055895ad349291e7810c5 (diff) | |
| download | autoconf-archive-09c7b008f3b6e5631afe10e1eebc09ac0ff32223.tar.gz | |
AX_BOOST_*: bug fixes for MinGW and FC
Diffstat (limited to 'm4/ax_boost_thread.m4')
| -rw-r--r-- | m4/ax_boost_thread.m4 | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/m4/ax_boost_thread.m4 b/m4/ax_boost_thread.m4 index 301ab1a..a59ea32 100644 --- a/m4/ax_boost_thread.m4 +++ b/m4/ax_boost_thread.m4 @@ -20,7 +20,7 @@ # # LAST MODIFICATION # -# 2007-07-26 +# 2007-11-22 # # COPYLEFT # @@ -93,7 +93,6 @@ AC_DEFUN([AX_BOOST_THREAD], AC_SUBST(BOOST_CPPFLAGS) AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::Thread library is available]) - BN_BOOST_THREAD_LIB=boost_thread BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` LDFLAGS_SAVE=$LDFLAGS @@ -104,14 +103,23 @@ AC_DEFUN([AX_BOOST_THREAD], ;; esac if test "x$ax_boost_user_thread_lib" = "x"; then - for libextension in `ls $BOOSTLIBDIR/libboost_thread*.{so,a}* | sed 's,.*/,,' | sed -e 's;^libboost_thread\(.*\)\.so.*$;\1;' -e 's;^libboost_thread\(.*\)\.a*$;\1;'` ; do - ax_lib=${BN_BOOST_THREAD_LIB}${libextension} + for libextension in `ls $BOOSTLIBDIR/libboost_thread*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.so.*$;\1;' -e 's;^lib\(boost_thread.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} AC_CHECK_LIB($ax_lib, exit, [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], [link_thread="no"]) done + if test "x$link_thread" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_thread*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.dll.*$;\1;' -e 's;^\(boost_thread.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], + [link_thread="no"]) + done + fi + else - for ax_lib in $ax_boost_user_thread_lib $BN_BOOST_THREAD_LIB-$ax_boost_user_thread_lib; do + for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do AC_CHECK_LIB($ax_lib, exit, [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], [link_thread="no"]) |