You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2014/01/23 00:24:56 UTC
git commit: Removed --without-curl from libprocess configuration.
Updated Branches:
refs/heads/master 1edeadc61 -> 7321c385f
Removed --without-curl from libprocess configuration.
From: Timothy St. Clair <ts...@redhat.com>
Review: https://reviews.apache.org/r/17130
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7321c385
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7321c385
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7321c385
Branch: refs/heads/master
Commit: 7321c385f3970c33f040fe090aa392e3449cdc92
Parents: 1edeadc
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Wed Jan 22 15:16:46 2014 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Wed Jan 22 15:16:46 2014 -0800
----------------------------------------------------------------------
configure.ac | 55 ++++++++++++-------------------------------------------
1 file changed, 12 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7321c385/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 9f96b7d..aa6ee45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,12 +125,6 @@ AC_ARG_ENABLE([optimize],
[don't try to compile with optimizations]),
[], [enable_optimize=yes])
-AC_ARG_WITH([curl],
- AS_HELP_STRING([--without-curl],
- [builds Mesos assuming libcurl
- (and its dependencies) are available]),
- [], [with_curl=yes])
-
AC_ARG_WITH([included-zookeeper],
AS_HELP_STRING([--without-included-zookeeper],
[excludes building and using the included ZooKeeper
@@ -583,44 +577,19 @@ fi
AM_CONDITIONAL([HAS_PYTHON], [test "x$has_python" = "xyes"])
+AC_CHECK_LIB([z], [gzread], [],
+ [AC_MSG_ERROR([cannot find libz
+-------------------------------------------------------------------
+libz is required for mesos to build.
+-------------------------------------------------------------------
+])])
-# Check if we should/can build with libcurl.
-if test "x$with_curl" = "xyes"; then
- AC_CHECK_LIB([z], [gzread], [],
- [AC_MSG_ERROR([cannot find libz
- -------------------------------------------------------------------
- We need libz for libcurl; you can avoid this with --without-curl,
- but it will mean executor and task resources cannot be downloaded
- over http.
- -------------------------------------------------------------------
- ])])
-
- AC_CHECK_LIB([crypto], [BN_init], [],
- [AC_MSG_ERROR([cannot find libcrypto
- -------------------------------------------------------------------
- We need libcrypto for libcurl; you can avoid this with
- --without-curl, but it will mean executor and task resources cannot
- be downloaded over http.
- -------------------------------------------------------------------
- ])])
-
- AC_CHECK_LIB([ssl], [SSL_accept], [],
- [AC_MSG_ERROR([cannot find libssl
- -------------------------------------------------------------------
- We need libssl for libcurl; you can avoid this with --without-curl,
- but it will mean executor and task resources cannot be downloaded
- over http.
- -------------------------------------------------------------------
- ])])
-
- AC_CHECK_LIB([curl], [curl_global_init], [],
- [AC_MSG_ERROR([cannot find libcurl
- -------------------------------------------------------------------
- You can avoid this with --without-curl, but it will mean executor
- and task resources cannot be downloaded over http.
- -------------------------------------------------------------------
- ])])
-fi
+AC_CHECK_LIB([curl], [curl_global_init], [],
+ [AC_MSG_ERROR([cannot find libcurl
+-------------------------------------------------------------------
+libcurl is required for mesos to build.
+-------------------------------------------------------------------
+])])
AM_CONDITIONAL([WITH_INCLUDED_ZOOKEEPER],