From 154e6b085ef4715f04b9597035b9a5e83962b545 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 8 Jul 2016 02:27:33 +0300 Subject: Disable epoll by default and fix formatting in epoll in configure.ac --- configure.ac | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 0e1c6b8bf..0a86ffb58 100644 --- a/configure.ac +++ b/configure.ac @@ -147,22 +147,25 @@ AC_ARG_ENABLE( # AC_ARG_ENABLE([epoll], [AS_HELP_STRING([--enable-epoll],[use epoll(4) on Linux])], - [enable_epoll=$enableval], [enable_epoll=auto]) + [enable_epoll=$enableval], + [enable_epoll=no] +) if test x$enable_epoll = xno; then have_linux_epoll=no else - AC_MSG_CHECKING([for Linux epoll(4)]) - AC_LINK_IFELSE([AC_LANG_PROGRAM( - [ - #ifndef __linux__ - #error This is not Linux - #endif - #include - ], - [epoll_create1 (EPOLL_CLOEXEC);])], - [have_linux_epoll=yes], - [have_linux_epoll=no]) - AC_MSG_RESULT([$have_linux_epoll]) + AC_MSG_CHECKING([for Linux epoll(4)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [ + #ifndef __linux__ + #error This is not Linux + #endif + #include + ], + [epoll_create1 (EPOLL_CLOEXEC);])], + [have_linux_epoll=yes], + [have_linux_epoll=no] + ) + AC_MSG_RESULT([$have_linux_epoll]) fi if test x$enable_epoll,$have_linux_epoll = xyes,no; then AC_MSG_ERROR([epoll support explicitly enabled but not available]) -- cgit v1.2.3-70-g09d2