diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-23 10:27:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-23 10:27:01 -0400 |
| commit | c366e1fa322625fa96a9c7114bb63a002d016e27 (patch) | |
| tree | 21e4ad32e8c9364befd3b73b9621d94c8c5a5deb /configure.ac | |
| parent | 9b6e57290fad73d968d12398c018f16b345f2c23 (diff) | |
| parent | 517e0f965bfafdcd798ccac7419e5c7da921dcd7 (diff) | |
| download | tor-c366e1fa322625fa96a9c7114bb63a002d016e27.tar.gz tor-c366e1fa322625fa96a9c7114bb63a002d016e27.zip | |
Merge remote-tracking branch 'public/remove_old_libevent_autoconf_stuff'
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 098a15ca93..9c4f02d908 100644 --- a/configure.ac +++ b/configure.ac @@ -438,15 +438,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" @@ -487,13 +478,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> ]) |