diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-12 16:59:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-12 16:59:05 -0400 |
| commit | 517e0f965bfafdcd798ccac7419e5c7da921dcd7 (patch) | |
| tree | 50bf22e983673c0ef1e56446a142762890a57c2c /configure.ac | |
| parent | 3ee2fca7ca6138916688d7d415a1091b8b3e1724 (diff) | |
| download | tor-517e0f965bfafdcd798ccac7419e5c7da921dcd7.tar.gz tor-517e0f965bfafdcd798ccac7419e5c7da921dcd7.zip | |
Remove workarounds for Libevent < 1.3.
This actually lets us dump a lot of old cruft that nobody had (I
hope!) tested in ages.
Closes 15248.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index e5e36d5c07..93893b3f8d 100644 --- a/configure.ac +++ b/configure.ac @@ -439,15 +439,6 @@ AC_SUBST(TOR_LIB_WS32) AC_SUBST(TOR_LIB_GDI) AC_SUBST(TOR_LIB_IPHLPAPI) -dnl We need to do this before we try our disgusting hack below. -AC_CHECK_HEADERS([sys/types.h]) - -dnl This is a disgusting hack so we safely include older libevent headers. -AC_CHECK_TYPE(u_int64_t, unsigned long long) -AC_CHECK_TYPE(u_int32_t, unsigned long) -AC_CHECK_TYPE(u_int16_t, unsigned short) -AC_CHECK_TYPE(u_int8_t, unsigned char) - tor_libevent_pkg_redhat="libevent" tor_libevent_pkg_debian="libevent-dev" tor_libevent_devpkg_redhat="libevent-devel" @@ -488,13 +479,10 @@ save_CPPFLAGS="$CPPFLAGS" LIBS="-levent $STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32 $LIBS" LDFLAGS="$TOR_LDFLAGS_libevent $LDFLAGS" CPPFLAGS="$TOR_CPPFLAGS_libevent $CPPFLAGS" -AC_CHECK_FUNCS([event_get_version \ - event_get_version_number \ - event_get_method \ - event_set_log_callback \ +AC_CHECK_FUNCS([event_get_version_number \ evutil_secure_rng_set_urandom_device_file \ evutil_secure_rng_init \ - event_base_loopexit]) + ]) AC_CHECK_MEMBERS([struct event.min_heap_idx], , , [#include <event.h> ]) |