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:22 UTC
[6/7] git commit: Added --with-apr and --with-svn to libprocess
configure.
Added --with-apr and --with-svn to libprocess configure.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7a1020ed
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7a1020ed
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7a1020ed
Branch: refs/heads/master
Commit: 7a1020ed2d24782dc6059674036fb52240291caa
Parents: 6a778df
Author: Benjamin Hindman <be...@gmail.com>
Authored: Sat Oct 25 16:27:06 2014 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sun Oct 26 22:33:34 2014 -0700
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/Makefile.am | 2 -
3rdparty/libprocess/configure.ac | 57 +++++++++++++++++++++++++++
2 files changed, 57 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7a1020ed/3rdparty/libprocess/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/Makefile.am b/3rdparty/libprocess/3rdparty/Makefile.am
index 4c6b2f1..e933c1c 100644
--- a/3rdparty/libprocess/3rdparty/Makefile.am
+++ b/3rdparty/libprocess/3rdparty/Makefile.am
@@ -186,8 +186,6 @@ endif
stout_tests_CPPFLAGS = \
-I$(srcdir)/$(STOUT)/include \
-I$(PROTOBUF)/src \
- -I/usr/include/subversion-1 \
- -I/usr/include/apr-1 \
$(AM_CPPFLAGS)
if WITH_BUNDLED_GMOCK
http://git-wip-us.apache.org/repos/asf/mesos/blob/7a1020ed/3rdparty/libprocess/configure.ac
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/configure.ac b/3rdparty/libprocess/configure.ac
index ee482fc..ec4d5a5 100644
--- a/3rdparty/libprocess/configure.ac
+++ b/3rdparty/libprocess/configure.ac
@@ -132,6 +132,17 @@ AC_ARG_WITH([zlib],
will be far less responsive; not recommended]),
[], [with_zlib=yes])
+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]),
+ [], [])
+
+
# There is no prefix installation of the JAR.
AC_ARG_VAR([PROTOBUF_JAR], [full path to protobuf jar on prefixed builds])
@@ -181,6 +192,52 @@ if test -n "`echo $with_glog`"; then
LDFLAGS="$LDFLAGS -L${with_glog}/lib"
fi
+
+# 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.
+-------------------------------------------------------------------
+])])
+
+
GMOCKSRC="gmock-all.cc"
GTESTSRC="gtest-all.cc"