[or-cvs] r14640: Try to build correctly on win32 with libevent versions 1.4.x (tor/trunk)

[nickm at seul.org]

Author: nickm
Date: 2008-05-16 15:44:57 -0400 (Fri, 16 May 2008)
New Revision: 14640

Modified:
   tor/trunk/
   tor/trunk/configure.in
Log:
 r19797 at 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.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r19797] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2008-05-16 19:19:49 UTC (rev 14639)
+++ tor/trunk/configure.in	2008-05-16 19:44:57 UTC (rev 14640)
@@ -232,11 +232,19 @@
 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"