Merge branch 'maint-0.2.9' into release-0.2.9
This commit is contained in:
commit
b77bc9a1bb
|
@ -0,0 +1,3 @@
|
||||||
|
o Minor bugfixes (compilation):
|
||||||
|
- Fix Libevent detection on platforms without Libevent 1 headers
|
||||||
|
installed. Fixes bug 21051; bugfix on 0.2.9.1-alpha.
|
|
@ -508,12 +508,13 @@ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $STATIC_LIBEVENT_FLAGS $T
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
#endif
|
#endif
|
||||||
void *event_init(void);],
|
struct event_base;
|
||||||
|
struct event_base *event_base_new(void);],
|
||||||
[
|
[
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
{WSADATA d; WSAStartup(0x101,&d); }
|
{WSADATA d; WSAStartup(0x101,&d); }
|
||||||
#endif
|
#endif
|
||||||
event_init();
|
event_base_new();
|
||||||
], [--with-libevent-dir], [/opt/libevent])
|
], [--with-libevent-dir], [/opt/libevent])
|
||||||
|
|
||||||
dnl Determine the incantation needed to link libevent.
|
dnl Determine the incantation needed to link libevent.
|
||||||
|
|
Loading…
Reference in New Issue