Commit ddb35cf2 authored by Mark Andrews's avatar Mark Andrews
Browse files

2521. [bug] Improve epoll cross compilation support. [RT #19047]

parent 4aa174dd
2521. [bug] Improve epoll cross compilation support. [RT #19047]
2520. [bug] Update xml statistics version number to 2.0 as change 2520. [bug] Update xml statistics version number to 2.0 as change
#2388 made the schema incompatible to the previous #2388 made the schema incompatible to the previous
version. [RT #19080] version. [RT #19080]
......
...@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl ...@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.461 $) AC_REVISION($Revision: 1.462 $)
AC_INIT(lib/dns/name.c) AC_INIT(lib/dns/name.c)
AC_PREREQ(2.59) AC_PREREQ(2.59)
...@@ -367,10 +367,10 @@ AC_SUBST(ISC_PLATFORM_HAVEKQUEUE) ...@@ -367,10 +367,10 @@ AC_SUBST(ISC_PLATFORM_HAVEKQUEUE)
# so we need to try running the code, not just test its existence. # so we need to try running the code, not just test its existence.
# #
AC_ARG_ENABLE(epoll, AC_ARG_ENABLE(epoll,
[ --enable-epoll use Linux epoll when available [[default=yes]]], [ --enable-epoll use Linux epoll when available [[default=auto]]],
want_epoll="$enableval", want_epoll="yes") want_epoll="$enableval", want_epoll="auto")
case $want_epoll in case $want_epoll in
yes) auto)
AC_MSG_CHECKING(epoll support) AC_MSG_CHECKING(epoll support)
AC_TRY_RUN([ AC_TRY_RUN([
#include <sys/epoll.h> #include <sys/epoll.h>
...@@ -385,6 +385,9 @@ int main() { ...@@ -385,6 +385,9 @@ int main() {
[AC_MSG_RESULT(no) [AC_MSG_RESULT(no)
ISC_PLATFORM_HAVEEPOLL="#undef ISC_PLATFORM_HAVEEPOLL"]) ISC_PLATFORM_HAVEEPOLL="#undef ISC_PLATFORM_HAVEEPOLL"])
;; ;;
yes)
ISC_PLATFORM_HAVEEPOLL="#define ISC_PLATFORM_HAVEEPOLL 1"
;;
*) *)
ISC_PLATFORM_HAVEEPOLL="#undef ISC_PLATFORM_HAVEEPOLL" ISC_PLATFORM_HAVEEPOLL="#undef ISC_PLATFORM_HAVEEPOLL"
;; ;;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment