diff options
| author | Xiyue Deng <manphiz@gmail.com> | 2012-04-04 11:22:29 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-04-04 11:25:24 +0200 |
| commit | a93cc150578f2e47f4fbbfaa65d4c34f0271c951 (patch) | |
| tree | 069fe5deeac72b0f0ea160db425731d763fa92f8 /m4/ax_boost_unit_test_framework.m4 | |
| parent | 7ea1d1b18e5c1c3300936dd89c3e55b5b370ae72 (diff) | |
| download | autoconf-archive-a93cc150578f2e47f4fbbfaa65d4c34f0271c951.tar.gz | |
AX_BOOST_*: fixed detection of dynamic libraries on Mac OS X (*.dylib)
See <http://savannah.gnu.org/patch/?7719> for further details.
Diffstat (limited to 'm4/ax_boost_unit_test_framework.m4')
| -rw-r--r-- | m4/ax_boost_unit_test_framework.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/ax_boost_unit_test_framework.m4 b/m4/ax_boost_unit_test_framework.m4 index c8e823d..d286e13 100644 --- a/m4/ax_boost_unit_test_framework.m4 +++ b/m4/ax_boost_unit_test_framework.m4 @@ -76,9 +76,9 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK], 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* $BOOSTLIBDIR/libboost_unit_test_framework*.a* 2>/dev/null` ; do + for monitor_library in `ls $BOOSTLIBDIR/libboost_unit_test_framework*.so* $BOOSTLIBDIR/libboost_unit_test_framework*.dylib* $BOOSTLIBDIR/libboost_unit_test_framework*.a* 2>/dev/null` ; do if test -r $monitor_library ; then - 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;'` + libextension=`echo $monitor_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a.*$;\1;'` ax_lib=${libextension} link_unit_test_framework="yes" else @@ -92,7 +92,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK], 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 + for libextension in `ls $BOOSTLIBDIR/boost_unit_test_framework*.dll* $BOOSTLIBDIR/boost_unit_test_framework*.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], |