Commit 17410ae1 authored by Tiago Peixoto's avatar Tiago Peixoto

configure.ac: Fix CGAL detection

parent 1dc6d7ba
Pipeline #330 failed with stage
in 387 minutes and 16 seconds
...@@ -161,6 +161,10 @@ AX_BOOST_GRAPH ...@@ -161,6 +161,10 @@ AX_BOOST_GRAPH
if test "$BOOST_GRAPH_LIB" = ""; then if test "$BOOST_GRAPH_LIB" = ""; then
AC_MSG_ERROR([No usable boost::graph found]) AC_MSG_ERROR([No usable boost::graph found])
fi fi
AX_BOOST_THREAD
if test "$BOOST_THREAD_LIB" = ""; then
AC_MSG_ERROR([No usable boost::thread found])
fi
[BOOST_LIBS="${BOOST_IOSTREAMS_LIB} -l${BOOST_PYTHON_LIB} ${BOOST_REGEX_LIB} ${BOOST_COROUTINE_LIB}"] [BOOST_LIBS="${BOOST_IOSTREAMS_LIB} -l${BOOST_PYTHON_LIB} ${BOOST_REGEX_LIB} ${BOOST_COROUTINE_LIB}"]
......
# =========================================================================== # ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_lib_cgal_core.html # https://www.gnu.org/software/autoconf-archive/ax_lib_cgal_core.html
# =========================================================================== # ===========================================================================
# #
# SYNOPSIS # SYNOPSIS
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
# and this notice are preserved. This file is offered as-is, without any # and this notice are preserved. This file is offered as-is, without any
# warranty. # warranty.
#serial 3.1 (locally modified) #serial 4.1 (locally modified for graph-tool)
AC_DEFUN([AX_LIB_CGAL_CORE],[ AC_DEFUN([AX_LIB_CGAL_CORE],[
...@@ -58,7 +58,7 @@ for ac_cgal_iterate in $ac_cgal_dirs ; do ...@@ -58,7 +58,7 @@ for ac_cgal_iterate in $ac_cgal_dirs ; do
CPPFLAGS="$CPPFLAGS $CGAL_CPPFLAGS $BOOST_CPPFLAGS" CPPFLAGS="$CPPFLAGS $CGAL_CPPFLAGS $BOOST_CPPFLAGS"
export CPPFLAGS export CPPFLAGS
CGAL_LDFLAGS="-L$ac_cgal_iterate/lib -lCGAL -lCGAL_Core -lgmp" CGAL_LDFLAGS="-L$ac_cgal_iterate/lib -lCGAL -lCGAL_Core -lgmp ${BOOST_THREAD_LIB}"
LDFLAGS_SAVED="$LDFLAGS" LDFLAGS_SAVED="$LDFLAGS"
LDFLAGS="$LDFLAGS $CGAL_LDFLAGS" LDFLAGS="$LDFLAGS $CGAL_LDFLAGS"
export LDFLAGS export LDFLAGS
......
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