Repository: mesos Updated Branches: refs/heads/master 4a9c63ac4 -> f95c42a95
Add --with-curl to libprocess since <stout/net.hpp> needs it. libprocess uses `<stout/net.hpp>` which includes `<curl/curl.h>`. On a machine without system-level libcurl installed, we should be able to build `mesos` with the `--with-curl=<path-to-libcurl>` flag. The `-I<path-to-libcurl>` gets added to the `CPPFLAGS` for `mesos` but it doesn't added for libprocess. This patch makes libprocess actually use the `--with-curl` flag. Review: https://reviews.apache.org/r/26352 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f95c42a9 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f95c42a9 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f95c42a9 Branch: refs/heads/master Commit: f95c42a95af19079ba1949074ad6a473cfdbc56c Parents: 4a9c63a Author: Michael Park <[email protected]> Authored: Tue Oct 7 13:38:54 2014 -0500 Committer: Timothy St. Clair <[email protected]> Committed: Tue Oct 7 13:38:54 2014 -0500 ---------------------------------------------------------------------- 3rdparty/libprocess/configure.ac | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/f95c42a9/3rdparty/libprocess/configure.ac ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/configure.ac b/3rdparty/libprocess/configure.ac index 501de40..ee482fc 100644 --- a/3rdparty/libprocess/configure.ac +++ b/3rdparty/libprocess/configure.ac @@ -93,6 +93,11 @@ AC_ARG_WITH([libev], location prefixed by the given path]), [without_bundled_libev=yes], []) +AC_ARG_WITH([curl], + AS_HELP_STRING([--with-curl=@<:@=DIR@:>@], + [specify where to locate the curl library]), + [], []) + AC_ARG_WITH([glog], AS_HELP_STRING([--with-glog@<:@=DIR@:>@], [excludes building and using the bundled glog @@ -166,6 +171,11 @@ if test -n "`echo $with_libev`"; then LDFLAGS="$LDFLAGS -L${with_libev}/lib" fi +if test -n "`echo $with_curl`" ; then + CPPFLAGS="$CPPFLAGS -I${with_curl}/include" + LDFLAGS="$LDFLAGS -L${with_curl}/lib" +fi + if test -n "`echo $with_glog`"; then CPPFLAGS="$CPPFLAGS -I${with_glog}/include" LDFLAGS="$LDFLAGS -L${with_glog}/lib" @@ -323,6 +333,14 @@ fi AM_CONDITIONAL([WITH_BUNDLED_PICOJSON], [test "x$with_bundled_picojson" = "xyes"]) +AC_CHECK_LIB([curl], [curl_global_init], [], + [AC_MSG_ERROR([cannot find libcurl +------------------------------------------------------------------- +libcurl is required for libprocess to build. +------------------------------------------------------------------- +])]) + + # Check if user has asked us to use a preinstalled glog, or if they # asked us to ignore all bundled libraries while compiling and # linking.
