From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 16 May 2008 20:13:10 +0000 (+0000)
Subject: More muddling around to get configure.in to recognize recent libevents.  Really,... 
X-Git-Tag: tor-0.2.1.1-alpha~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29a962475443d8ef979346e9b7452f159b3cde31;p=thirdparty%2Ftor.git

More muddling around to get configure.in to recognize recent libevents.  Really, libevent should be fixed too so that the next poor sucker doesn't have to do this.

svn:r14641
---

diff --git a/configure.in b/configure.in
index 1ce1f7fa4e..0ae7cb9654 100644
--- a/configure.in
+++ b/configure.in
@@ -238,10 +238,14 @@ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $TOR_LIB_WS32], [
 #include <stdlib.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <event.h>], [void exit(int); void *event_init(void);],
+#include <event.h>], [
+#ifdef WIN32
+#include <winsock2.h>
+#endif
+void exit(int); void *event_init(void);],
     [
 #ifdef WIN32
-{WSAData d; WSAStartup(0x101,&d); }
+{WSADATA d; WSAStartup(0x101,&d); }
 #endif
 event_init(); exit(0);
 ], [--with-libevent-dir], [/opt/libevent])