From a34ec229bf3241eff9622b28bdc61aad468fa40b Mon Sep 17 00:00:00 2001
From: jilles <devnull@localhost>
Date: Fri, 30 Mar 2007 16:33:43 -0700
Subject: [PATCH] [svn] Need to check for various flavours of epoll, even if
 --enable-epoll is forced.

---
 ChangeLog       | 9 +++++++++
 configure.ac    | 5 +++--
 include/serno.h | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0f1e94a..03c5a63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+jilles      2007/03/30 23:32:43 UTC	(20070330-3321)
+  Log:
+  Hack to allow some more warnings, already present in configure (?).
+  
+
+  Changes:	Modified:
+  +1 -1		trunk/aclocal.m4 (File Modified) 
+
+
 jilles      2007/03/29 20:03:06 UTC	(20070329-3319)
   Log:
   Merge old trunk r2077,r2079:
diff --git a/configure.ac b/configure.ac
index a6b1d13..9956522 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac 3145 2007-01-25 06:45:04Z nenolod $
+dnl $Id: configure.ac 3323 2007-03-30 23:33:43Z jilles $
 dnl Process this file with autoconf to produce a configure script.
 
 dnl TODO: clean up all the OpenSSL and shared module checking stuff;
@@ -8,7 +8,7 @@ dnl said functions need to be just about as complex as they already are.
 AC_PREREQ(2.57)
 
 dnl Sneaky way to get an Id tag into the configure script
-AC_COPYRIGHT([$Id: configure.ac 3145 2007-01-25 06:45:04Z nenolod $])
+AC_COPYRIGHT([$Id: configure.ac 3323 2007-03-30 23:33:43Z jilles $])
 
 AC_INIT([charybdis],[2.2.0])
 
@@ -668,6 +668,7 @@ AC_ARG_ENABLE(devpoll,AC_HELP_STRING([--enable-devpoll],[Force usage of /dev/pol
 AC_ARG_ENABLE(epoll, AC_HELP_STRING([--enable-epoll],[Force sys_epoll usage (Linux only).]),
 [ if test $enableval = yes; then 
 	SELECT_TYPE_EXPLICIT="epoll"
+	AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes], [haveepoll=no])
   else
   	use_epoll=no
   fi
diff --git a/include/serno.h b/include/serno.h
index 043b4be..b4d8521 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070329-3319"
+#define SERNO "20070330-3321"