Don't check protobuf jar in libprocess. Review: https://reviews.apache.org/r/36810
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/472fbbfd Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/472fbbfd Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/472fbbfd Branch: refs/heads/master Commit: 472fbbfde065cb112a6f0ef7c50900300e8dcbed Parents: c532490 Author: haosdent huang <[email protected]> Authored: Mon Aug 17 17:24:49 2015 -0700 Committer: Adam B <[email protected]> Committed: Mon Aug 17 17:47:18 2015 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/configure.ac | 13 ------------- 1 file changed, 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/472fbbfd/3rdparty/libprocess/configure.ac ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/configure.ac b/3rdparty/libprocess/configure.ac index bb8c27b..7c2bcff 100644 --- a/3rdparty/libprocess/configure.ac +++ b/3rdparty/libprocess/configure.ac @@ -181,9 +181,6 @@ AC_ARG_WITH([ssl], [specify where to locate the ssl library]), [], []) -# There is no prefix installation of the JAR. -AC_ARG_VAR([PROTOBUF_JAR], [full path to protobuf jar on prefixed builds]) - # Do some OS specific setup. case "${target_os}" in linux*) @@ -544,13 +541,6 @@ if test "x$without_bundled_protobuf" = "xyes" || \ if test "x$found_protobuf" = "xyes"; then with_bundled_protobuf=no - if test -z "`echo $PROTOBUF_JAR`"; then - PROTOBUF_JAR="${PROTOBUFPREFIX}/share/java/protobuf.jar" - fi - - AC_CHECK_FILE([$PROTOBUF_JAR], - [], - [AC_MSG_ERROR([cannot find PROTOBUF_JAR=$PROTOBUF_JAR])]) AC_CHECK_TOOL([PROTOCOMPILER_TEST], [protoc], [], [$PROTOBUFPREFIX/bin]) @@ -572,14 +562,11 @@ correct if you're already doing this. fi else with_bundled_protobuf=yes - PROTOBUF_JAR="\${MESOS_BUILD_DIR}/src/java/target/protobuf-java-2.5.0.jar" fi AM_CONDITIONAL([WITH_BUNDLED_PROTOBUF], [test "x$with_bundled_protobuf" = "xyes"]) -AC_SUBST([PROTOBUF_JAR]) - # Default to gcc toolchain (we rely on some atomic builtins for now, # that are also present with clang). AC_PROG_CXX([g++])
