Commit 1a6f6c41 authored by Tiago Peixoto's avatar Tiago Peixoto

Fix detection of boost::coroutine

This causes the test to fail when only static variables are available.
parent add3d518
...@@ -231,11 +231,11 @@ AC_CHECK_LIB(CGAL,main) ...@@ -231,11 +231,11 @@ AC_CHECK_LIB(CGAL,main)
[CGAL_LIBADD="-lCGAL -lgmp"] [CGAL_LIBADD="-lCGAL -lgmp"]
AC_SUBST(CGAL_LIBADD) AC_SUBST(CGAL_LIBADD)
[CGAL_FLAGS="-frounding-math"] [CGAL_FLAGS="-frounding-math"]
AC_MSG_CHECKING(whether to cgal debbuging with valgrind) AC_MSG_CHECKING(whether to enable cgal debbuging with valgrind)
AC_ARG_ENABLE([cgal-valgrind], [AS_HELP_STRING([--enable-cgal-valgrind],[enable CGAL valgrind debugging [default=disabled] ])], AC_ARG_ENABLE([cgal-valgrind], [AS_HELP_STRING([--enable-cgal-valgrind],[enable CGAL valgrind debugging [default=disabled] ])],
if test $enableval = yes; then if test $enableval = yes; then
[AC_MSG_RESULT(yes)] [AC_MSG_RESULT(yes)]
[CGAL_FLAGS="${CGAL_FLAGS} -DCGAL_DISABLE_ROUNDING_MATH_CHECK=ON"] [CGAL_FLAGS="${CGAL_FLAGS} -DCGAL_DISABLE_ROUNDING_MATH_CHECK=ON"]
else else
[AC_MSG_RESULT(no)] [AC_MSG_RESULT(no)]
fi fi
......
...@@ -79,11 +79,10 @@ AC_DEFUN([AX_BOOST_COROUTINE], ...@@ -79,11 +79,10 @@ AC_DEFUN([AX_BOOST_COROUTINE],
if test "x$ax_cv_boost_coroutine" = "xyes"; then if test "x$ax_cv_boost_coroutine" = "xyes"; then
AC_SUBST(BOOST_CPPFLAGS) AC_SUBST(BOOST_CPPFLAGS)
AC_DEFINE(HAVE_BOOST_COROUTINE,,[define if the Boost::Coroutine library is available])
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
if test "x$ax_boost_user_coroutine_lib" = "x"; then if test "x$ax_boost_user_coroutine_lib" = "x"; then
for libextension in `ls $BOOSTLIBDIR/libboost_coroutine*.so* $BOOSTLIBDIR/libboost_coroutine*.dylib* $BOOSTLIBDIR/libboost_coroutine*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_coroutine.*\)\.so.*$;\1;' -e 's;^lib\(boost_coroutine.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_coroutine.*\)\.a.*$;\1;'` ; do for libextension in `ls $BOOSTLIBDIR/libboost_coroutine*.so* $BOOSTLIBDIR/libboost_coroutine*.dylib* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_coroutine.*\)\.so.*$;\1;' -e 's;^lib\(boost_coroutine.*\)\.dylib.*$;\1;'` ; do
ax_lib=${libextension} ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit, AC_CHECK_LIB($ax_lib, exit,
[BOOST_COROUTINE_LIB="-l$ax_lib"; AC_SUBST(BOOST_COROUTINE_LIB) link_coroutine="yes"; break], [BOOST_COROUTINE_LIB="-l$ax_lib"; AC_SUBST(BOOST_COROUTINE_LIB) link_coroutine="yes"; break],
...@@ -114,6 +113,11 @@ AC_DEFUN([AX_BOOST_COROUTINE], ...@@ -114,6 +113,11 @@ AC_DEFUN([AX_BOOST_COROUTINE],
if test "x$link_coroutine" = "xno"; then if test "x$link_coroutine" = "xno"; then
AC_MSG_ERROR(Could not link against $ax_lib !) AC_MSG_ERROR(Could not link against $ax_lib !)
fi fi
if test "x$BOOST_COROUTINE_LIB" != "x"; then
AC_DEFINE(HAVE_BOOST_COROUTINE,,[define if the Boost::Coroutine library is available])
fi
fi fi
CPPFLAGS="$CPPFLAGS_SAVED" CPPFLAGS="$CPPFLAGS_SAVED"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment