Browse Source

Merge branch 'bug21051_v2' into maint-0.2.9

Nick Mathewson 3 years ago
parent
commit
c27ae62ade
2 changed files with 6 additions and 2 deletions
  1. 3 0
      changes/bug21051
  2. 3 2
      configure.ac

+ 3 - 0
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.

+ 3 - 2
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.