3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-26 23:01:04 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3153 from pijyoi/autoconf_wepoll

Browse Source 
Problem: not able to use wepoll in configure script
This commit is contained in:
Simon Giesecke 2018-06-03 11:45:44 +02:00 committed by GitHub
commit d07ddb1bce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -257,6 +257,11 @@ src_libzmq_la_SOURCES = \
src/zap_client.hpp \
src/zmq_draft.h
if USE_WEPOLL
src_libzmq_la_SOURCES += \
external/wepoll/wepoll.c
endif
if USE_TWEETNACL
src_libzmq_la_SOURCES += \
src/tweetnacl.c \

10
acinclude.m4
View File

@ -1052,7 +1052,7 @@ AC_DEFUN([LIBZMQ_CHECK_POLLER], [{
# Allow user to override poller autodetection
AC_ARG_WITH([poller],
[AS_HELP_STRING([--with-poller],
[choose I/O thread polling system manually. Valid values are 'kqueue', 'epoll', 'devpoll', 'pollset', 'poll', 'select', or 'auto'. [default=auto]])])
[choose I/O thread polling system manually. Valid values are 'kqueue', 'epoll', 'devpoll', 'pollset', 'poll', 'select', 'wepoll', or 'auto'. [default=auto]])])
# Allow user to override poller autodetection
AC_ARG_WITH([api_poller],
@ -1134,6 +1134,12 @@ AC_DEFUN([LIBZMQ_CHECK_POLLER], [{
poller_found=1
])
;;
wepoll)
# wepoll can only be manually selected
AC_MSG_NOTICE([Using 'wepoll' I/O thread polling system])
AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_EPOLL, 1, [Use 'epoll' I/O thread polling system])
poller_found=1
;;
esac
test $poller_found -eq 1 && break
done
@ -1146,6 +1152,8 @@ AC_DEFUN([LIBZMQ_CHECK_POLLER], [{
if test "x$with_api_poller" == "xauto"; then
if test $poller == "select"; then
api_poller=select
elif test $poller == "wepoll"; then
api_poller=select
else
api_poller=poll
fi

2
configure.ac
View File

@ -507,6 +507,8 @@ AM_CONDITIONAL(USE_LIBSODIUM, test "$curve_library" = "libsodium")
AM_CONDITIONAL(USE_TWEETNACL, test "$curve_library" = "tweetnacl")
AM_CONDITIONAL(HAVE_CURVE, test "x$curve_library" != "x")
AM_CONDITIONAL(USE_WEPOLL, test "$poller" = "wepoll")
# build using pgm
have_pgm_library="no"