From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 16 May 2008 19:44:57 +0000 (+0000)
Subject:  r19797@catbus:  nickm | 2008-05-16 15:42:53 -0400
X-Git-Tag: tor-0.2.1.1-alpha~114
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f55caa72260a2e2ce9ebd89416d7fb0617dbe4a;p=thirdparty%2Ftor.git

 r19797@catbus:  nickm | 2008-05-16 15:42:53 -0400
 Try to build correctly on win32 with libevent versions 1.4.x or greater. 1.4.5 should remove the need to do this, but hey. Backport candidate.


svn:r14640
---

diff --git a/configure.in b/configure.in
index 2a153ddbbd..1ce1f7fa4e 100644
--- a/configure.in
+++ b/configure.in
@@ -232,11 +232,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"