diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-23 11:04:18 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-23 11:04:18 -0500 |
| commit | b77bc9a1bb67c8229ada985619a088e5a78359fd (patch) | |
| tree | 8da7a5598479ac47017720b33e8e62f612770bb4 | |
| parent | 99513f763c1867e0f6f45c47d2ad36c4f4097a42 (diff) | |
| parent | c27ae62adefb9fcdf468eef43e8a33ae3657a6bf (diff) | |
| download | tor-b77bc9a1bb67c8229ada985619a088e5a78359fd.tar.gz tor-b77bc9a1bb67c8229ada985619a088e5a78359fd.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -rw-r--r-- | changes/bug21051 | 3 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug21051 b/changes/bug21051 new file mode 100644 index 0000000000..8bb4f80c8e --- /dev/null +++ b/changes/bug21051 @@ -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. diff --git a/configure.ac b/configure.ac index 7ba4a4139e..ed01888de9 100644 --- a/configure.ac +++ b/configure.ac @@ -508,12 +508,13 @@ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $STATIC_LIBEVENT_FLAGS $T #ifdef _WIN32 #include <winsock2.h> #endif -void *event_init(void);], +struct event_base; +struct event_base *event_base_new(void);], [ #ifdef _WIN32 {WSADATA d; WSAStartup(0x101,&d); } #endif -event_init(); +event_base_new(); ], [--with-libevent-dir], [/opt/libevent]) dnl Determine the incantation needed to link libevent. |