diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-02-21 22:44:03 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-02-21 22:44:03 +0000 |
| commit | 04f7a46ceca36d7ab42e50ffbd50bc675ec1538a (patch) | |
| tree | cb957b555e816115f44de95d1df430a5b1fdd221 /cpp/configure.ac | |
| parent | 3ea03dcf8164f0f395a162ee7723d674a69dc0fd (diff) | |
| download | qpid-python-04f7a46ceca36d7ab42e50ffbd50bc675ec1538a.tar.gz | |
QPID-3571: A generic Posix poller implementation
Wired manual selection of poll/epoll implementations
into autoconf/cmake.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1292066 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/configure.ac')
| -rw-r--r-- | cpp/configure.ac | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index a3318531bd..6ba5f62f0e 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -448,7 +448,7 @@ AC_ARG_WITH([poller], [AS_HELP_STRING([--with-poller], [The low level poller implementation: poll/solaris-ecf/epoll])], [case ${withval} in poll) - AC_CHECK_HEADERS([sys/poll.h],[poller=no],[AC_MSG_ERROR([Can't find poll.h header file for poll])]) + AC_CHECK_HEADERS([sys/poll.h],[poller=poll],[AC_MSG_ERROR([Can't find poll.h header file for poll])]) ;; solaris-ecf) AC_CHECK_HEADERS([port.h],[poller=solaris-ecf],[AC_MSG_ERROR([Can't find port.h header file for solaris-ecf])]) @@ -458,14 +458,17 @@ AC_ARG_WITH([poller], ;; esac], [ - AC_CHECK_HEADERS([sys/poll.h],[poller=no],) - AC_CHECK_HEADERS([port.h],[poller=solaris-ecf],) + # We check for poll first so that it is overridden + AC_CHECK_HEADERS([sys/poll.h],[poller=poll],) + # Not currently supported - WIP + #AC_CHECK_HEADERS([port.h],[poller=solaris-ecf],) AC_CHECK_HEADERS([sys/epoll.h],[poller=epoll],) ] ) -AM_CONDITIONAL([HAVE_ECF], [test x$poller = xsolaris-ecf]) -AM_CONDITIONAL([HAVE_EPOLL], [test x$poller = xepoll]) +AM_CONDITIONAL([USE_ECF], [test x$poller = xsolaris-ecf]) +AM_CONDITIONAL([USE_POLL], [test x$poller = xpoll]) +AM_CONDITIONAL([USE_EPOLL], [test x$poller = xepoll]) #Filter not implemented or invalid mechanisms if test $poller = xno; then |