From 5c28bb3beb3830a8e2e5c323fdc8620e91298395 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 20 Jun 2008 12:04:49 +0000 Subject: [PATCH] 2008-06-20 Tatsuhiro Tsujikawa Added configure option to enable/disable epoll support. * configure.ac --- ChangeLog | 5 +++++ configure | 10 ++++++++++ configure.ac | 5 ++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 480a7ba3..113b77b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-06-20 Tatsuhiro Tsujikawa + + Added configure option to enable/disable epoll support. + * configure.ac + 2008-06-17 Tatsuhiro Tsujikawa Updated man page. diff --git a/configure b/configure index c7edaca6..464316c4 100755 --- a/configure +++ b/configure @@ -1414,6 +1414,7 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-bittorrent enable BitTorrent support. Default: yes --enable-metalink enable Metalink support. Default: yes + --enable-epoll enable epoll support. Default: yes --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-xmltest Do not try to compile and run a test LIBXML program @@ -2740,6 +2741,13 @@ else enable_metalink=yes fi +# Check whether --enable-epoll was given. +if test "${enable_epoll+set}" = set; then + enableval=$enable_epoll; enable_epoll=$enableval +else + enable_epoll=yes +fi + # Checks for programs. ac_ext=cpp @@ -20000,6 +20008,7 @@ fi done +if test "x$enable_epoll" = "xyes"; then for ac_func in epoll_create do @@ -20094,6 +20103,7 @@ _ACEOF fi done +fi for ac_func in asctime_r diff --git a/configure.ac b/configure.ac index 6a92ab2c..e112f8ba 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,7 @@ AC_ARG_WITH([libcares], [ --with-libcares use c-ares library if inst AC_ARG_ENABLE([bittorrent], [ --enable-bittorrent enable BitTorrent support. Default: yes], [enable_bittorrent=$enableval], [enable_bittorrent=yes]) AC_ARG_ENABLE([metalink], [ --enable-metalink enable Metalink support. Default: yes], [enable_metalink=$enableval], [enable_metalink=yes]) +AC_ARG_ENABLE([epoll], [ --enable-epoll enable epoll support. Default: yes], [enable_epoll=$enableval], [enable_epoll=yes]) # Checks for programs. AC_PROG_CXX @@ -183,7 +184,9 @@ AC_FUNC_STRFTIME AC_FUNC_VPRINTF AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify atexit daemon ftruncate getcwd gethostbyaddr gethostbyname getpagesize inet_ntoa memchr memmove mempcpy memset mkdir munmap nl_langinfo posix_memalign putenv rmdir select setlocale sleep socket stpcpy strcasecmp strchr strcspn strdup strerror strncasecmp strstr strtol strtoul strtoull tzset unsetenv usleep]) -AC_CHECK_FUNCS([epoll_create]) +if test "x$enable_epoll" = "xyes"; then + AC_CHECK_FUNCS([epoll_create]) +fi AC_CHECK_FUNCS([asctime_r], [AM_CONDITIONAL([HAVE_ASCTIME_R], true)],