cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-10 13:04:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patches-2.0'

Browse Source
This commit is contained in:
Nick Mathewson 2011-06-01 13:52:27 -04:00
commit 36f745df22
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -160,7 +160,7 @@ CORE_SRC = event.c evthread.c buffer.c \
evmap.c log.c evutil.c evutil_rand.c strlcpy.c $(SYS_SRC) evmap.c log.c evutil.c evutil_rand.c strlcpy.c $(SYS_SRC)
EXTRA_SRC = event_tagging.c http.c evdns.c evrpc.c EXTRA_SRC = event_tagging.c http.c evdns.c evrpc.c
if BUILD_WIN32 if BUILD_WITH_NO_UNDEFINED
NO_UNDEFINED = -no-undefined NO_UNDEFINED = -no-undefined
MAYBE_CORE = libevent_core.la MAYBE_CORE = libevent_core.la
else else
@ -180,6 +180,7 @@ libevent_core_la_LDFLAGS = $(GENERIC_LDFLAGS)
if PTHREADS if PTHREADS
libevent_pthreads_la_SOURCES = evthread_pthread.c libevent_pthreads_la_SOURCES = evthread_pthread.c
libevent_pthreads_la_LIBADD = $(MAYBE_CORE)
libevent_pthreads_la_LDFLAGS = $(GENERIC_LDFLAGS) libevent_pthreads_la_LDFLAGS = $(GENERIC_LDFLAGS)
endif endif

15
configure.in
View File

@ -109,6 +109,19 @@ die horribly
bwin32=false; AC_MSG_RESULT(no), 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]) AC_CHECK_HEADERS([zlib.h])
if test "x$ac_cv_header_zlib_h" = "xyes"; then if test "x$ac_cv_header_zlib_h" = "xyes"; then
@ -242,6 +255,8 @@ if test "x$ac_cv_header_sys_sysctl_h" = "xyes"; then
fi fi
AM_CONDITIONAL(BUILD_WIN32, test x$bwin32 = xtrue) 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 if test x$bwin32 = xtrue; then
AC_SEARCH_LIBS([getservbyname],[ws2_32]) AC_SEARCH_LIBS([getservbyname],[ws2_32])