From 154e6b085ef4715f04b9597035b9a5e83962b545 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 8 Jul 2016 02:27:33 +0300
Subject: Disable epoll by default and fix formatting in epoll in configure.ac

---
 configure    | 22 ++++++++++++----------
 configure.ac | 29 ++++++++++++++++-------------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/configure b/configure
index eb928cad1..12860c38d 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac 7f3fd6d.
+# From configure.ac 6a3c3cc.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -3549,27 +3549,28 @@ fi
 
 
 #
-# EPOLL (Linux Only)
+# Epoll
 #
 # Check whether --enable-epoll was given.
 if test "${enable_epoll+set}" = set; then :
   enableval=$enable_epoll; enable_epoll=$enableval
 else
-  enable_epoll=auto
+  enable_epoll=no
+
 fi
 
 if test x$enable_epoll = xno; then
 	have_linux_epoll=no
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux epoll(4)" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux epoll(4)" >&5
 $as_echo_n "checking for Linux epoll(4)... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-        #ifndef __linux__
-        #error This is not Linux
-        #endif
-        #include <sys/epoll.h>
+		#ifndef __linux__
+		#error This is not Linux
+		#endif
+		#include <sys/epoll.h>
 
 int
 main ()
@@ -3583,10 +3584,11 @@ if ac_fn_c_try_link "$LINENO"; then :
   have_linux_epoll=yes
 else
   have_linux_epoll=no
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_linux_epoll" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_linux_epoll" >&5
 $as_echo "$have_linux_epoll" >&6; }
 fi
 if test x$enable_epoll,$have_linux_epoll = xyes,no; then
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 <sys/epoll.h>
-        ],
-        [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 <sys/epoll.h>
+		],
+		[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-60-g2f50