Repository: mesos Updated Branches: refs/heads/master c532490bf -> 922eca767
Don't check protobuf jar when --disable-java flag. Review: https://reviews.apache.org/r/36811 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/922eca76 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/922eca76 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/922eca76 Branch: refs/heads/master Commit: 922eca767711d6e930eb7c1da180d910db792f42 Parents: 472fbbf Author: haosdent huang <[email protected]> Authored: Mon Aug 17 17:26:16 2015 -0700 Committer: Adam B <[email protected]> Committed: Mon Aug 17 17:47:18 2015 -0700 ---------------------------------------------------------------------- configure.ac | 134 +++++++++++++++++++++++++++--------------------------- 1 file changed, 68 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/922eca76/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index a478ebd..9855cca 100644 --- a/configure.ac +++ b/configure.ac @@ -489,72 +489,6 @@ AM_CONDITIONAL([WITH_BUNDLED_ZOOKEEPER], [test "x$with_bundled_zookeeper" = "xyes"]) -# Check if user has asked us to use a preinstalled protobuf, or if -# they asked us to ignore all bundled libraries while compiling and -# linking. -if test "x$without_bundled_protobuf" = "xyes" || \ - test "x$enable_bundled" != "xyes"; then - # Use the system default prefix if not specified. - if test -n "`echo $with_protobuf`"; then - PROTOBUFPREFIX="${with_protobuf}" - elif test "x$enable_bundled" != "xyes"; then - PROTOBUFPREFIX="/usr" - fi - - # Check for protobuf. - # TODO(jieyu): Symbol _init is not available for libs on OS X. - # Consider checking lib using AX_CXX_CHECK_LIB. - AC_CHECK_HEADERS([google/protobuf/message.h], - [AC_CHECK_LIB([protobuf], - [_init], - [found_protobuf=yes])]) - - 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]) - - if test -z "`echo $PROTOCOMPILER_TEST`"; then - AC_MSG_ERROR([protoc not found in PATH]) - fi - - PROTOCOMPILER="$PROTOBUFPREFIX/bin/protoc" - - if test "x$enable_python" = "xyes"; then - AC_PYTHON_MODULE([google.protobuf], [yes]) - fi - - else - AC_MSG_ERROR([cannot find protobuf -------------------------------------------------------------------- -You have requested the use of a non-bundled protobuf but no suitable -protobuf could be found. - -You may want specify the location of protobuf by providing a prefix -path via --with-protobuf=DIR, or check that the path you provided is -correct if youre 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]) -AC_SUBST([PROTOCOMPILER]) - AS_CASE($ax_cv_cxx_compiler_vendor, [clang], [ # Check if -Wno-unused-local-typedef is needed by checking a sample @@ -1448,6 +1382,74 @@ AM_CONDITIONAL([WITHOUT_PYTHON_DEPS], AM_CONDITIONAL([GIT_REPO], [test -d ${srcdir}"/.git"]) +# Check if user has asked us to use a preinstalled protobuf, or if +# they asked us to ignore all bundled libraries while compiling and +# linking. +if test "x$without_bundled_protobuf" = "xyes" || \ + test "x$enable_bundled" != "xyes"; then + # Use the system default prefix if not specified. + if test -n "`echo $with_protobuf`"; then + PROTOBUFPREFIX="${with_protobuf}" + elif test "x$enable_bundled" != "xyes"; then + PROTOBUFPREFIX="/usr" + fi + + # Check for protobuf. + # TODO(jieyu): Symbol _init is not available for libs on OS X. + # Consider checking lib using AX_CXX_CHECK_LIB. + AC_CHECK_HEADERS([google/protobuf/message.h], + [AC_CHECK_LIB([protobuf], + [_init], + [found_protobuf=yes])]) + + 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 + + if test "x$enable_java" = "xyes"; then + AC_CHECK_FILE([$PROTOBUF_JAR], + [], + [AC_MSG_ERROR([cannot find PROTOBUF_JAR=$PROTOBUF_JAR])]) + fi + + AC_CHECK_TOOL([PROTOCOMPILER_TEST], [protoc], [], [$PROTOBUFPREFIX/bin]) + + if test -z "`echo $PROTOCOMPILER_TEST`"; then + AC_MSG_ERROR([protoc not found in PATH]) + fi + + PROTOCOMPILER="$PROTOBUFPREFIX/bin/protoc" + + if test "x$enable_python" = "xyes"; then + AC_PYTHON_MODULE([google.protobuf], [yes]) + fi + + else + AC_MSG_ERROR([cannot find protobuf +------------------------------------------------------------------- +You have requested the use of a non-bundled protobuf but no suitable +protobuf could be found. + +You may want specify the location of protobuf by providing a prefix +path via --with-protobuf=DIR, or check that the path you provided is +correct if youre 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]) +AC_SUBST([PROTOCOMPILER]) + # Check if libevent prefix path was provided, and if so, add it to # the CPPFLAGS and LDFLAGS with respective /include and /lib path # suffixes.
