diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-05-18 16:26:15 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-05-18 16:26:15 +0000 |
| commit | 611d58e0bca1b7a30b14b44bc3aabb0bd7848764 (patch) | |
| tree | 34ca045544ac56a0f033fa5754b58936cf473810 | |
| parent | 9704ff2c571ba986f793e9f861123cf3b56dcc83 (diff) | |
| download | tor-611d58e0bca1b7a30b14b44bc3aabb0bd7848764.tar.gz tor-611d58e0bca1b7a30b14b44bc3aabb0bd7848764.zip | |
r19818@catbus: nickm | 2008-05-18 12:25:22 -0400
Backport: tests for libevent 1.4.x that work on mingw.
svn:r14659
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.in | 10 |
2 files changed, 12 insertions, 1 deletions
@@ -3,6 +3,9 @@ Changes in version 0.2.0.27-rc - 2008-05-?? - A new contrib/tor-exit-notice.html file that exit relay operators can put on their website to help reduce abuse queries. + o Minor features (build): + - Add support to detect Libevent versions in the 1.4.x series on mingw. + Changes in version 0.2.0.26-rc - 2008-05-13 Tor 0.2.0.26-rc fixes a major security vulnerability caused by a bug diff --git a/configure.in b/configure.in index 1c71ccd8fe..360376bc60 100644 --- a/configure.in +++ b/configure.in @@ -231,11 +231,19 @@ tor_libevent_devpkg_redhat="libevent-devel" tor_libevent_devpkg_debian="libevent-dev" TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $TOR_LIB_WS32], [ +#ifdef WIN32 +#include <winsock2.h> +#endif #include <stdlib.h> #include <sys/time.h> #include <sys/types.h> #include <event.h>], [void exit(int); void *event_init(void);], - [event_init(); exit(0);], [--with-libevent-dir], [/opt/libevent]) + [ +#ifdef WIN32 +{WSAData d; WSAStartup(0x101,&d); } +#endif +event_init(); exit(0); +], [--with-libevent-dir], [/opt/libevent]) dnl Now check for particular libevent functions. save_LIBS="$LIBS" |