GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

autoconf: fix --disable-thread-support build under win32

Browse Source 
Fixes: https://ci.appveyor.com/project/azat/libevent/build/job/gvud4tcqsd5bnarl
Fixes: https://ci.appveyor.com/project/azat/libevent/build/2.1.6.80/job/5frnb1c3n4quxxqy
Fixes: https://ci.appveyor.com/project/azat/libevent/build/2.1.6.80/job/3wdahbrew7setmoa
This commit is contained in:
Azat Khuzhin 2016-08-07 22:19:39 +03:00
parent 1810857425
commit bb09535bda
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -142,10 +142,14 @@ include test/include.am
if BUILD_WIN32 if BUILD_WIN32
SYS_LIBS = -lws2_32 -lshell32 -ladvapi32 SYS_LIBS = -lws2_32 -lshell32 -ladvapi32
SYS_SRC = win32select.c evthread_win32.c buffer_iocp.c event_iocp.c \ SYS_SRC = win32select.c buffer_iocp.c event_iocp.c \
bufferevent_async.c bufferevent_async.c
SYS_INCLUDES = -IWIN32-Code -IWIN32-Code/nmake SYS_INCLUDES = -IWIN32-Code -IWIN32-Code/nmake
if THREADS
SYS_SRC += evthread_win32.c
endif
else else
SYS_LIBS = SYS_LIBS =

1
configure.ac
View File

@ -749,6 +749,7 @@ if test x$bwin32 != xtrue && test "$enable_thread_support" != "no"; then
#include <pthread.h> ] #include <pthread.h> ]
) )
fi fi
AM_CONDITIONAL(THREADS, [test "$enable_thread_support" != "no"])
AM_CONDITIONAL(PTHREADS, [test "$have_pthreads" != "no" && test "$enable_thread_support" != "no"]) AM_CONDITIONAL(PTHREADS, [test "$have_pthreads" != "no" && test "$enable_thread_support" != "no"])
# check if we should compile locking into the library # check if we should compile locking into the library

2
test/include.am
View File

@ -101,8 +101,10 @@ regress_thread_SOURCES = test/regress_thread.c
PTHREAD_LIBS += libevent_pthreads.la PTHREAD_LIBS += libevent_pthreads.la
endif endif
if BUILD_WIN32 if BUILD_WIN32
if THREADS
regress_thread_SOURCES = test/regress_thread.c regress_thread_SOURCES = test/regress_thread.c
endif endif
endif
if ZLIB_REGRESS if ZLIB_REGRESS
regress_zlib_SOURCES = test/regress_zlib.c regress_zlib_SOURCES = test/regress_zlib.c
endif endif