This is an automated email from the ASF dual-hosted git repository. tillt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 53976ee21282fcafe93e20bc33dbf31dab23cfcf Author: Till Toenshoff <[email protected]> AuthorDate: Thu Oct 4 15:40:38 2018 +0200 Removed version check from libevent dependency tracking from libprocess. Review: https://reviews.apache.org/r/68905/ --- 3rdparty/libprocess/configure.ac | 9 +------ 3rdparty/libprocess/m4/libevent.m4 | 51 +------------------------------------- 2 files changed, 2 insertions(+), 58 deletions(-) diff --git a/3rdparty/libprocess/configure.ac b/3rdparty/libprocess/configure.ac index c3e3964..4c58032 100644 --- a/3rdparty/libprocess/configure.ac +++ b/3rdparty/libprocess/configure.ac @@ -803,14 +803,7 @@ if test "x$enable_libevent" = "xyes"; then # linking. if test "x$without_bundled_libevent" = "xyes" || \ test "x$enable_bundled" != "xyes"; then - MESOS_HAVE_LIBEVENT([2.0.22], [], [ - AC_MSG_ERROR([libevent version is incompatible -------------------------------------------------------------------- -libevent version 2.0.22 is the most recent we currently support. - -You may want to install an older version of libevent on your system -and point this build system to it via --with-libevent=DIR. --------------------------------------------------------------------])]) + MESOS_HAVE_LIBEVENT() else with_bundled_libevent=yes fi diff --git a/3rdparty/libprocess/m4/libevent.m4 b/3rdparty/libprocess/m4/libevent.m4 index 3a7fcad..cd52b3f 100644 --- a/3rdparty/libprocess/m4/libevent.m4 +++ b/3rdparty/libprocess/m4/libevent.m4 @@ -18,7 +18,7 @@ # # SYNOPSIS # -# MESOS_HAVE_LIBEVENT(MINIMAL_VERSION, action-if-true, action-if-false) +# MESOS_HAVE_LIBEVENT() # # DESCRIPTION # @@ -53,53 +53,4 @@ libevent_pthreads version 2+ headers are required for libprocess to build. libevent_pthreads version 2+ is required for libprocess to build. ------------------------------------------------------------------- ])]) - - AC_MSG_CHECKING([for libevent version]) - - # Save our flags. - saved_CFLAGS="$CFLAGS" - saved_LIBS="$LIBS" - - # Required flags for libevent. - LIBS="-levent" - CFLAGS="" - - # Compile and run C program that gets the libevent version numnber into - # "conftest.out" which gets cleaned up by AC_RUN_IFELSE itself. - AC_LANG_PUSH([C]) - AC_RUN_IFELSE([ - AC_LANG_SOURCE([[ - #include <event.h> - #include <stdio.h> - - int main(int argc, char** argv) - { - FILE* fp = fopen("conftest.out", "w"); - fprintf(fp, "%s", event_get_version()); - fclose(fp); - return 0; - } - ]])], - [libevent_version=`cat conftest.out`]) - AC_LANG_POP([C]) - - # Restore flags. - CFLAGS="$saved_CFLAGS" - LIBS="$saved_LIBS" - - AC_MSG_RESULT([$libevent_version]) - - AS_IF([test "x${libevent_version}" = "x"], [:], [ - AX_COMPARE_VERSION([$libevent_version], - [le], [$1], - [is_libevent_usable=yes]) - ]) - - AS_IF([test "x$is_libevent_usable" = "xyes"], [ - $2 - : - ], [ - $3 - : - ]) ])
