[or-cvs] r14659: Backport: tests for libevent 1.4.x that work on mingw. (tor/branches/tor-0_2_0-patches)

[nickm at seul.org]

Author: nickm
Date: 2008-05-18 12:26:15 -0400 (Sun, 18 May 2008)
New Revision: 14659

Modified:
   tor/branches/tor-0_2_0-patches/
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/configure.in
Log:
 r19818 at catbus:  nickm | 2008-05-18 12:25:22 -0400
 Backport: tests for libevent 1.4.x that work on mingw.



Property changes on: tor/branches/tor-0_2_0-patches
___________________________________________________________________
 svk:merge ticket from /tor/020 [r19818] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-05-18 01:56:32 UTC (rev 14658)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-05-18 16:26:15 UTC (rev 14659)
@@ -3,7 +3,10 @@
     - A new contrib/tor-exit-notice.html file that exit relay operators
       can put on their website to help reduce abuse queries.
 
+  o Minor features (build):
+    - Add support to detect Libevent versions in the 1.4.x series on mingw.
 
+
 Changes in version 0.2.0.26-rc - 2008-05-13
   Tor 0.2.0.26-rc fixes a major security vulnerability caused by a bug
   in Debian's OpenSSL packages.  All users running any 0.2.0.x version

Modified: tor/branches/tor-0_2_0-patches/configure.in
===================================================================
--- tor/branches/tor-0_2_0-patches/configure.in	2008-05-18 01:56:32 UTC (rev 14658)
+++ tor/branches/tor-0_2_0-patches/configure.in	2008-05-18 16:26:15 UTC (rev 14659)
@@ -231,11 +231,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"