diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-01-15 07:15:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:40:55 -0500 |
| commit | 274df78541eec948e546bb98901b5bb00aaadc00 (patch) | |
| tree | 959390245acf753ef11ddbc78280a9baf8bdacf9 /source4/lib/replace | |
| parent | f5473306c53b53f7e13bce74a0fb1138699afa22 (diff) | |
| download | samba-274df78541eec948e546bb98901b5bb00aaadc00.tar.gz samba-274df78541eec948e546bb98901b5bb00aaadc00.tar.bz2 samba-274df78541eec948e546bb98901b5bb00aaadc00.zip | |
r20788: - remove epoll configure checks from libreplace
- fix epoll configure checks for the epoll and aio
events backends
- we should only activate the epoll backend if sys/epoll.h
and epoll_create() are found
- we should only activate the aio backend if sys/epoll.h, epoll_create(),
libaio.h and io_getevents() are found
hopefully fix the build on 'bnhtest' in the build farm...
metze
(This used to be commit d46a5efb03ea1df50567cad00e1589870cdb31fe)
Diffstat (limited to 'source4/lib/replace')
| -rw-r--r-- | source4/lib/replace/libreplace.m4 | 3 | ||||
| -rw-r--r-- | source4/lib/replace/system/select.h | 9 |
2 files changed, 0 insertions, 12 deletions
diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4 index b63c0fd471..dff6098297 100644 --- a/source4/lib/replace/libreplace.m4 +++ b/source4/lib/replace/libreplace.m4 @@ -63,9 +63,6 @@ AC_CHECK_FUNCS(pipe strftime srandom random srand rand usleep setbuffer lstat ge AC_CHECK_HEADERS(stdbool.h sys/select.h) -AC_CHECK_HEADERS(sys/epoll.h) -AC_CHECK_FUNCS(epoll_create) - AC_CHECK_TYPE(bool, [AC_DEFINE(HAVE_BOOL, 1, [Whether the bool type is available])],, [ diff --git a/source4/lib/replace/system/select.h b/source4/lib/replace/system/select.h index 0d1eabbc35..20346259c2 100644 --- a/source4/lib/replace/system/select.h +++ b/source4/lib/replace/system/select.h @@ -30,13 +30,4 @@ #define SELECT_CAST #endif -/* use epoll if it is available */ -#if defined(HAVE_EPOLL_CREATE) && defined(HAVE_SYS_EPOLL_H) -#define WITH_EPOLL 1 -#endif - -#if WITH_EPOLL -#include <sys/epoll.h> -#endif - #endif |