Merge remote-tracking branch 'public/Fix_19450'

1 files changed, 0 insertions, 36 deletions

diff --git a/configure.ac b/configure.ac
index a1a55e1b40..42cbfd0529 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,9 +161,6 @@ AC_ARG_ENABLE(tor2web-mode,
     CFLAGS="$CFLAGS -D ENABLE_TOR2WEB_MODE=1"
 fi])
 
-AC_ARG_ENABLE(bufferevents,
-     AS_HELP_STRING(--enable-bufferevents, [use Libevent's buffered IO]))
-
 AC_ARG_ENABLE(tool-name-check,
      AS_HELP_STRING(--disable-tool-name-check, [check for sanely named toolchain when cross-compiling]))
 
@@ -552,39 +549,6 @@ LIBS="$save_LIBS"
 LDFLAGS="$save_LDFLAGS"
 CPPFLAGS="$save_CPPFLAGS"
 
-dnl bufferents require version 2.0.13
-if test "$enable_bufferevents" = "yes"; then
-   AC_CHECK_HEADERS(event2/bufferevent_ssl.h)
-
-   CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent"
-
-   AC_MSG_CHECKING([whether Libevent is new enough for bufferevents])
-   AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <event2/event.h>
-#if !defined(LIBEVENT_VERSION_NUMBER) || LIBEVENT_VERSION_NUMBER < 0x02000d00
-#error
-int x = y(zz);
-#else
-int x = 1;
-#endif
-   ])], [ AC_MSG_RESULT([yes]) ],
-      [ AC_MSG_RESULT([no])
-        AC_MSG_ERROR([Libevent does not seem new enough to support bufferevents.  We require 2.0.13-stable or later]) ] )
-fi
-
-LIBS="$save_LIBS"
-LDFLAGS="$save_LDFLAGS"
-CPPFLAGS="$save_CPPFLAGS"
-
-AM_CONDITIONAL(USE_BUFFEREVENTS, test "$enable_bufferevents" = "yes")
-if test "$enable_bufferevents" = "yes"; then
-  AC_DEFINE(USE_BUFFEREVENTS, 1, [Defined if we're going to use Libevent's buffered IO API])
-  if test "$enable_static_libevent" = "yes"; then
-    TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent_openssl.a $TOR_LIBEVENT_LIBS"
-  else
-    TOR_LIBEVENT_LIBS="-levent_openssl $TOR_LIBEVENT_LIBS"
-  fi
-fi
 AC_SUBST(TOR_LIBEVENT_LIBS)
 
 dnl ------------------------------------------------------