You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2012/10/27 01:41:12 UTC
svn commit: r1402719 - in /incubator/mesos/trunk: configure.ac
third_party/libprocess/configure.ac
Author: benh
Date: Fri Oct 26 23:41:12 2012
New Revision: 1402719
URL: http://svn.apache.org/viewvc?rev=1402719&view=rev
Log:
Building with libcurl and libz by default, and provide useful messages
when they are missing.
From: Ben Mahler <be...@gmail.com>
Review: https://reviews.apache.org/r/7666
Modified:
incubator/mesos/trunk/configure.ac
incubator/mesos/trunk/third_party/libprocess/configure.ac
Modified: incubator/mesos/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.ac?rev=1402719&r1=1402718&r2=1402719&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.ac (original)
+++ incubator/mesos/trunk/configure.ac Fri Oct 26 23:41:12 2012
@@ -128,10 +128,10 @@ AC_ARG_ENABLE([optimize],
[], [enable_optimize=yes])
AC_ARG_WITH([curl],
- AS_HELP_STRING([--with-curl],
+ AS_HELP_STRING([--without-curl],
[builds Mesos assuming libcurl
(and its dependencies) are available]),
- [], [with_curl=no])
+ [], [with_curl=yes])
AC_ARG_WITH([included-zookeeper],
AS_HELP_STRING([--without-included-zookeeper],
@@ -406,13 +406,40 @@ fi
# Check if we should/can build with libcurl.
if test "x$with_curl" = "xyes"; then
AC_CHECK_LIB([z], [gzread], [],
- [AC_MSG_ERROR([can't find libz])])
+ [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([can't find libcrypto])])
+ [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([can't find libssl])])
+ [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([can't find libcurl])])
+ [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
Modified: incubator/mesos/trunk/third_party/libprocess/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/configure.ac?rev=1402719&r1=1402718&r2=1402719&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/configure.ac (original)
+++ incubator/mesos/trunk/third_party/libprocess/configure.ac Fri Oct 26 23:41:12 2012
@@ -51,6 +51,12 @@ AC_ARG_ENABLE([install],
[install libprocess]),
[AC_MSG_ERROR([libprocess can not currently be installed])])
+AC_ARG_WITH([zlib],
+ AS_HELP_STRING([--without-zlib],
+ [disables zlib compression, which means the webui
+ will be far less responsive; not recommended]),
+ [], [with_zlib=yes])
+
# Checks for gcc toolchain (we rely on some atomic builtins for now).
AC_PROG_CXX([g++])
AC_PROG_CC([gcc])
@@ -58,4 +64,16 @@ AC_PROG_CC([gcc])
# Check for pthreads (uses m4/acx_pthread.m4).
ACX_PTHREAD([], [AC_MSG_ERROR([failed to find pthreads])])
+# Check if we should/can build with libz.
+if test "x$with_zlib" = "xyes"; then
+ AC_CHECK_LIB([z], [deflate, gzread, gzwrite, inflate], [],
+ [AC_MSG_ERROR([cannot find libz
+ -------------------------------------------------------------------
+ This means your webui would run very slowly because we cannot use
+ compression; you probably want to download and install zlib, but
+ you can get away without it by doing --without-zlib.
+ -------------------------------------------------------------------
+ ])])
+fi
+
AC_OUTPUT