[EPOLL] merged with upstream

diff --git a/configure.ac b/configure.ac
index 6b920df..8cbb520 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -906,6 +906,15 @@ AC_SUBST(cocoa_ldflags)
 # check for epoll support
 AC_CHECK_HEADERS([sys/epoll.h])
 
+AC_ARG_ENABLE(epoll,  
+   AC_HELP_STRING([--enable-epoll], [enable or disable epoll support]),  
+   [want_epoll=$enableval])  
+                    
+if test "x${want_epoll}" = "xyes" ; then  
+   # check for epoll support  
+   AC_CHECK_HEADERS([sys/epoll.h])  
+fi  
+
 # basic pthread support
 
 EFL_CHECK_PTHREAD([no], [have_pthread="yes"], [have_pthread="no"])

diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 0ddce29..10a4fd3 100644 (file)
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -49,8 +49,8 @@
 #include "ecore_private.h"
 
 #ifdef HAVE_SYS_EPOLL_H
-//# define HAVE_EPOLL
-//# include <sys/epoll.h>
+# define HAVE_EPOLL
+# include <sys/epoll.h>
 #endif
 
 #ifdef USE_G_MAIN_LOOP