Better check for epoll().

diff --git a/CHANGES b/CHANGES
index 94d2deed63d14134084d78816745bce7ee01d0c7..dc8aaf45107e6830f506030f2d6d05464971e0df 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+Fri Feb 16 16:53:16 EET 2007  Pekka Riikonen <priikone@silcnet.org>
+
+       * Added better check for epoll() in configure.  Affected file
+         is lib/configure.ad.
+
 Thu Feb 15 16:50:34 EET 2007  Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed per scheduler data input buffer in packet engine.  Use

diff --git a/TODO b/TODO
index 79e67d8ff4717dd8185083fc9c2676150b444bc6..7b4de93ef99bcf77cd69b284807d43d731f9e3a0 100644 (file)
--- a/TODO
+++ b/TODO
@@ -31,7 +31,7 @@ lib/silcclient, The Client Library    ***PARTLY DONE****
 
  o Finish all the missing SILC packet processings, rewrites. (***DONE)
 
- o The client_notify.c rewrite. (***TESTING NEEDED)
+ o The client_notify.c rewrite. (***DONE)
 
  o Resuming to client_register.c (remove client_resume.c)
    (***TESTING NEEDED)
@@ -51,7 +51,7 @@ lib/silcclient, The Client Library    ***PARTLY DONE****
  o Starting key exchange directly, rewrite. (***DONE)
 
  o Channel messages, channel private keys, channel entires, channel
-   search, etc. rewrite. (***TESTING NEEDED */
+   search, etc. rewrite. (***TESTING NEEDED)
 
  o For many APIs leave the hash context allocations to the caller instead
    of using client->sha1hash and client->md5hash, or some kind of thread
@@ -89,6 +89,8 @@ lib/silcsftp                  ****DONE****
 
  o Porting to use the new util library. (***DONE)
 
+ o Read-ahead (1.2)
+
 
 lib/silccore/silcpacket.[ch]   ****PARTLY DONE****
 ============================

diff --git a/configure.ad b/configure.ad
index 221edd9a8455308878883966850b32f2e9da8715..2b2313d53a56b0fa75c4f73a421a010b09c0a94e 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -179,7 +179,7 @@ AC_CHECK_FUNCS(poll select listen bind shutdown close connect setsockopt)
 AC_CHECK_FUNCS(setrlimit time ctime utime gettimeofday getrusage)
 AC_CHECK_FUNCS(chmod fcntl stat fstat getenv putenv strerror)
 AC_CHECK_FUNCS(getpid getgid getsid getpgid getpgrp getuid)
-AC_CHECK_FUNCS(setgroups initgroups nl_langinfo epoll_wait nanosleep)
+AC_CHECK_FUNCS(setgroups initgroups nl_langinfo nanosleep)
 AC_CHECK_FUNCS(strchr snprintf strstr strcpy strncpy memcpy memset memmove)
 
 #ifdef SILC_DIST_SIM

diff --git a/lib/configure.ad b/lib/configure.ad
index a3a7eea93edffabeb59b4091ff81fe70fbe2b028..6da5e7c572f3581f8d5d0f68443dd448b760bc9c 100644 (file)
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -110,6 +110,27 @@ AC_SUBST(LIBSILCSERVER_AGE)
 # Check for big-endian machines
 AC_C_BIGENDIAN
 
+# Check for epoll_wait and verify that epoll_create works
+AC_CHECK_FUNC(epoll_wait,
+  [
+    AC_RUN_IFELSE(
+      [
+        #include <sys/epoll.h>
+        int main()
+        {
+          int ret = epoll_create(5);
+          if (ret < 0)
+            return 1;
+          close(ret);
+          return 0;
+        }
+      ],
+      [
+        AC_DEFINE([HAVE_EPOLL_WAIT], [1], [HAVE_EPOLL_WAIT])
+      ],
+    )
+  ])
+
 #ifdef SILC_DIST_SIM
 # SIM modules directory
 #