From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 1 Jun 2011 17:48:02 +0000 (-0400)
Subject: cygwin: make it possible to build DLLs
X-Git-Tag: release-2.0.12-stable~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d54d3fc40dd3cdaf832a2d7f248a07f0f10d57a0;p=libevent

cygwin: make it possible to build DLLs

Patch from Brian Koehmstedt
---

diff --git a/Makefile.am b/Makefile.am
index 2c902426..5538caf2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -172,7 +172,7 @@ CORE_SRC = event.c evthread.c buffer.c \
 	evmap.c	log.c evutil.c evutil_rand.c strlcpy.c $(SYS_SRC)
 EXTRA_SRC = event_tagging.c http.c evdns.c evrpc.c
 
-if BUILD_WIN32
+if BUILD_WITH_NO_UNDEFINED
 NO_UNDEFINED = -no-undefined
 MAYBE_CORE = libevent_core.la
 else
@@ -192,6 +192,7 @@ libevent_core_la_LDFLAGS = $(GENERIC_LDFLAGS)
 
 if PTHREADS
 libevent_pthreads_la_SOURCES = evthread_pthread.c
+libevent_pthreads_la_LIBADD = $(MAYBE_CORE)
 libevent_pthreads_la_LDFLAGS = $(GENERIC_LDFLAGS)
 endif
 
diff --git a/configure.in b/configure.in
index cbc0d218..8517a0de 100644
--- a/configure.in
+++ b/configure.in
@@ -98,6 +98,19 @@ die horribly
 	bwin32=false; AC_MSG_RESULT(no),
 )
 
+dnl - check if the macro __CYGWIN__ is defined on this compiler.
+dnl - (this is how we check for a cygwin version of GCC)
+AC_MSG_CHECKING(for CYGWIN)
+AC_TRY_COMPILE(,
+	[
+#ifndef __CYGWIN__
+die horribly
+#endif
+	],
+	cygwin=true; AC_MSG_RESULT(yes),
+	cygwin=false; AC_MSG_RESULT(no),
+)
+
 AC_CHECK_HEADERS([zlib.h])
 
 if test "x$ac_cv_header_zlib_h" = "xyes"; then
@@ -231,6 +244,8 @@ if test "x$ac_cv_header_sys_sysctl_h" = "xyes"; then
 fi
 
 AM_CONDITIONAL(BUILD_WIN32, test x$bwin32 = xtrue)
+AM_CONDITIONAL(BUILD_CYGWIN, test x$cygwin = xtrue)
+AM_CONDITIONAL(BUILD_WITH_NO_UNDEFINED, test x$bwin32 = xtrue || test x$cygwin = xtrue)
 
 if test x$bwin32 = xtrue; then
    AC_SEARCH_LIBS([getservbyname],[ws2_32])