You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ti...@apache.org on 2014/12/09 22:48:36 UTC
[1/2] mesos git commit: Modified mesos configure.ac to set $with_svn
to `brew --prefix subversion` for OS X.
Repository: mesos
Updated Branches:
refs/heads/master 45b8f20fc -> e6be44560
Modified mesos configure.ac to set $with_svn to `brew --prefix subversion` for OS X.
Review: https://reviews.apache.org/r/28721
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/50b33821
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/50b33821
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/50b33821
Branch: refs/heads/master
Commit: 50b33821f1154a983dcf9d9bc2aec9acc83a1239
Parents: 45b8f20
Author: Michael Park <mc...@gmail.com>
Authored: Tue Dec 9 14:30:49 2014 -0700
Committer: Till Toenshoff <to...@me.com>
Committed: Tue Dec 9 14:38:35 2014 -0700
----------------------------------------------------------------------
configure.ac | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/50b33821/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 1ca6a6b..acc685c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -669,7 +669,14 @@ libapr-1 is required for mesos to build.
# 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
+if test -z "`echo $with_svn`" &&
+ test "$OS_NAME" = "darwin" &&
+ test -n "`command -v brew`" &&
+ test -n "`brew list --versions subversion`"; then
+ with_svn=`brew --prefix subversion`
+fi
+
+if test -n "`echo $with_svn`"; then
CPPFLAGS="-I${with_svn}/include/subversion-1 $CPPFLAGS"
LDFLAGS="-L${with_svn}/lib $LDFLAGS"
else
[2/2] mesos git commit: Modified libprocess configure.ac to set
$with_svn to `brew --prefix subversion` for OS X.
Posted by ti...@apache.org.
Modified libprocess configure.ac to set $with_svn to `brew --prefix subversion` for OS X.
Review: https://reviews.apache.org/r/28722
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e6be4456
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e6be4456
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e6be4456
Branch: refs/heads/master
Commit: e6be445607821916717c49e9de786768e8842069
Parents: 50b3382
Author: Michael Park <mc...@gmail.com>
Authored: Tue Dec 9 14:32:04 2014 -0700
Committer: Till Toenshoff <to...@me.com>
Committed: Tue Dec 9 14:39:22 2014 -0700
----------------------------------------------------------------------
3rdparty/libprocess/configure.ac | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e6be4456/3rdparty/libprocess/configure.ac
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/configure.ac b/3rdparty/libprocess/configure.ac
index 314c8b8..024f892 100644
--- a/3rdparty/libprocess/configure.ac
+++ b/3rdparty/libprocess/configure.ac
@@ -220,7 +220,14 @@ libapr-1 is required for mesos to build.
# 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
+if test -z "`echo $with_svn`" &&
+ test "$OS_NAME" = "darwin" &&
+ test -n "`command -v brew`" &&
+ test -n "`brew list --versions subversion`"; then
+ with_svn=`brew --prefix subversion`
+fi
+
+if test -n "`echo $with_svn`"; then
CPPFLAGS="-I${with_svn}/include/subversion-1 $CPPFLAGS"
LDFLAGS="-L${with_svn}/lib $LDFLAGS"
else