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_unit_test_framework.m4 | |
| parent | a5886ddebcb40686a10055895ad349291e7810c5 (diff) | |
| download | autoconf-archive-09c7b008f3b6e5631afe10e1eebc09ac0ff32223.tar.gz | |
AX_BOOST_*: bug fixes for MinGW and FC
Diffstat (limited to 'm4/ax_boost_unit_test_framework.m4')
| -rw-r--r-- | m4/ax_boost_unit_test_framework.m4 | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/m4/ax_boost_unit_test_framework.m4 b/m4/ax_boost_unit_test_framework.m4 index 195af36..b176746 100644 --- a/m4/ax_boost_unit_test_framework.m4 +++ b/m4/ax_boost_unit_test_framework.m4 @@ -21,7 +21,7 @@ # # LAST MODIFICATION # -# 2007-07-26 +# 2007-11-22 # # COPYLEFT # @@ -72,15 +72,14 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK], ]) if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_Test_Framework library is available]) - BN_BOOST_TEST_UNIT_TEST_FRAMEWORK_LIB=boost_unit_test_framework BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then saved_ldflags="${LDFLAGS}" for monitor_library in `ls $BOOSTLIBDIR/libboost_unit_test_framework*.{so,a}* 2>/dev/null` ; do if test -r $monitor_library ; then - libextension=`echo $monitor_library | sed 's,.*/,,' | sed -e 's;^libboost_unit_test_framework\(.*\)\.so.*$;\1;' -e 's;^libboost_unit_test_framework\(.*\)\.a*$;\1;'` - ax_lib=${BN_BOOST_TEST_UNIT_TEST_FRAMEWORK_LIB}${libextension} + libextension=`echo $monitor_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a*$;\1;'` + ax_lib=${libextension} link_unit_test_framework="yes" else link_unit_test_framework="no" @@ -92,17 +91,25 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK], break fi done + if test "x$link_unit_test_framework" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_unit_test_framework*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_unit_test_framework.*\)\.dll.*$;\1;' -e 's;^\(boost_unit_test_framework.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"; AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) link_unit_test_framework="yes"; break], + [link_unit_test_framework="no"]) + done + fi else link_unit_test_framework="no" saved_ldflags="${LDFLAGS}" - for ax_lib in $BN_BOOST_TEST_UNIT_TEST_FRAMEWORK_LIB-$ax_boost_user_unit_test_framework_lib $ax_boost_user_unit_test_framework_lib ; do + for ax_lib in boost_unit_test_framework-$ax_boost_user_unit_test_framework_lib $ax_boost_user_unit_test_framework_lib ; do if test "x$link_unit_test_framework" = "xyes"; then break; fi for unittest_library in `ls $BOOSTLIBDIR/lib${ax_lib}.{so,a}* 2>/dev/null` ; do if test -r $unittest_library ; then - libextension=`echo $unittest_library | sed 's,.*/,,' | sed -e 's;^libboost_unit_test_framework\(.*\)\.so.*$;\1;' -e 's;^libboost_unit_test_framework\(.*\)\.a*$;\1;'` - ax_lib=${BN_BOOST_TEST_UNIT_TEST_FRAMEWORK_LIB}${libextension} + libextension=`echo $unittest_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a*$;\1;'` + ax_lib=${libextension} link_unit_test_framework="yes" else link_unit_test_framework="no" @@ -116,7 +123,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK], done done fi - if test "x$link_unit_test_framework" = "xno"; then + if test "x$link_unit_test_framework" != "xyes"; then AC_MSG_ERROR(Could not link against $ax_lib !) fi fi |