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 2014/10/27 06:34:20 UTC
[4/7] git commit: Added --with-apr and --with-svn to Mesos configure.
Added --with-apr and --with-svn to Mesos configure.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d418c17b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d418c17b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d418c17b
Branch: refs/heads/master
Commit: d418c17b89856a9e9d43ece0a7c656f2489a922a
Parents: 7a1020e
Author: Benjamin Hindman <be...@gmail.com>
Authored: Sat Oct 25 16:29:04 2014 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sun Oct 26 22:33:34 2014 -0700
----------------------------------------------------------------------
configure.ac | 55 ++++++++++++++++++++++++++++++++++++++++++++
docs/getting-started.md | 19 ++++++++++++++-
src/Makefile.am | 2 --
3 files changed, 73 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d418c17b/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index c8c1f94..342e762 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,6 +193,16 @@ AC_ARG_WITH([zlib],
[specify where to locate the zlib library]),
[], [])
+AC_ARG_WITH([apr],
+ AS_HELP_STRING([--with-apr=@<:@=DIR@:>@],
+ [specify where to locate the apr-1 library]),
+ [], [])
+
+AC_ARG_WITH([svn],
+ AS_HELP_STRING([--with-svn=@<:@=DIR@:>@],
+ [specify where to locate the svn-1 library]),
+ [], [])
+
AC_ARG_ENABLE([bundled-distribute],
AS_HELP_STRING([--disable-bundled-distribute],
[excludes building and using the bundled distribute
@@ -630,6 +640,51 @@ libcurl is required for mesos to build.
])])
+# Check if libapr-1 prefix path was provided, and if so, add it to
+# the CPPFLAGS and LDFLAGS with respective /include/apr-1 and /lib path
+# suffixes. We include /include/apr-1 because we include <apr*>
+# headers directly.
+if test -n "`echo $with_apr`" ; then
+ CPPFLAGS="-I${with_apr}/include/apr-1 -I${with_apr}/include/apr-1.0 $CPPFLAGS"
+ LDFLAGS="-L${with_apr}/lib $LDFLAGS"
+else
+ CPPFLAGS="-I/usr/include/apr-1 -I/usr/include/apr-1.0 $CPPFLAGS"
+fi
+
+AC_CHECK_LIB([apr-1], [apr_initialize], [],
+ [AC_MSG_ERROR([cannot find libapr-1
+-------------------------------------------------------------------
+libapr-1 is required for mesos to build.
+-------------------------------------------------------------------
+])])
+
+
+# Check if libsvn-1 prefix path was provided, and if so, add it to
+# the CPPFLAGS and LDFLAGS with respective /include and /lib path
+# suffixes. We include /include/subversion-1 because we include
+# <svn_*> directly.
+if test -n "`echo $with_svn`" ; then
+ CPPFLAGS="-I${with_svn}/include/subversion-1 $CPPFLAGS"
+ LDFLAGS="-L${with_svn}/lib $LDFLAGS"
+else
+ CPPFLAGS="-I/usr/include/subversion-1 $CPPFLAGS"
+fi
+
+AC_CHECK_LIB([svn_subr-1], [svn_stringbuf_create_ensure], [],
+ [AC_MSG_ERROR([cannot find libsvn_subr-1
+-------------------------------------------------------------------
+libsubversion-1 is required for mesos to build.
+-------------------------------------------------------------------
+])])
+
+AC_CHECK_LIB([svn_delta-1], [svn_txdelta], [],
+ [AC_MSG_ERROR([cannot find libsvn_delta-1
+-------------------------------------------------------------------
+libsubversion-1 is required for mesos to build.
+-------------------------------------------------------------------
+])])
+
+
# Check if Sasl2 prefix path was provided, and if so, add it to
# the CPPFLAGS and LDFLAGS with respective /include and /lib path
# suffixes.
http://git-wip-us.apache.org/repos/asf/mesos/blob/d418c17b/docs/getting-started.md
----------------------------------------------------------------------
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 1602914..4014b28 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -46,6 +46,12 @@ There are different ways you can get Mesos:
# Install Maven (***Only required for Mesos 0.18.1 or newer***).
$ sudo apt-get install maven
+ # Install devel libapr1 (***Only required for Mesos 0.21.0 or newer***)
+ $ sudo apt-get install libapr1-dev
+
+ # Install devel libsvn (***Only required for Mesos 0.21.0 or newer***)
+ $ sudo apt-get install libsvn-dev
+
- If you are building from git repository, you will need to additionally install the following packages.
# Install autotoconf and automake.
@@ -58,9 +64,20 @@ There are different ways you can get Mesos:
- Following are the instructions for stock CentOS 6.5. If you are using a different OS, please install the packages accordingly.
+ Mesos 0.21.0+ requires subversion 1.8+ devel package which is not available by default by yum.
+ Add one of the repo that has subversion-devel 1.8 available, i.e:
+
+ Add new repo /etc/yum.repos.d/wandisco-svn.repo, with:
+
+ [WandiscoSVN]
+ name=Wandisco SVN Repo
+ baseurl=http://opensource.wandisco.com/centos/6/svn-1.8/RPMS/$basearch/
+ enabled=1
+ gpgcheck=0
+
$ sudo yum groupinstall -y "Development Tools"
- $ sudo yum install -y python-devel java-1.7.0-openjdk-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5
+ $ sudo yum install -y python-devel java-1.7.0-openjdk-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel
# Install maven.
$ wget http://mirror.nexcess.net/apache/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
http://git-wip-us.apache.org/repos/asf/mesos/blob/d418c17b/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 00d5d3c..6820d8a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,8 +89,6 @@ MESOS_CPPFLAGS += -I$(top_srcdir)/include
MESOS_CPPFLAGS += -I$(top_srcdir)/$(LIBPROCESS)/include
MESOS_CPPFLAGS += -I$(top_srcdir)/$(STOUT)/include
MESOS_CPPFLAGS += -I../include
-MESOS_CPPFLAGS += -I/usr/include/subversion-1
-MESOS_CPPFLAGS += -I/usr/include/apr-1
# Protobuf headers that depend on mesos.pb.h need this.
MESOS_CPPFLAGS += -I../include/mesos