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

diff --git a/CHANGES b/CHANGES
index 92508a27b99a289332bb5fc9a61abc5e616701b7..44c1d9ed302a828c77a52ca57e89ce1e5dffadc1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -121,6 +121,8 @@
 
 2522.  [security]      Handle -1 from DSA_do_verify() and EVP_VerifyFinal().
 
+2521.  [bug]           Improve epoll cross compilation support. [RT #19047]
+
 2519.  [bug]           dig/host with -4 or -6 didn't work if more than two
                        nameserver addresses of the excluded address family
                        preceded in resolv.conf. [RT #19081]

diff --git a/configure b/configure
index cd25636ca4cea496c2525b179985992768a7f7df..0e2803ed6393f1571c83a481b2afb011b4952327 100755 (executable)
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: configure,v 1.443.26.5 2009/03/13 05:30:45 marka Exp $
+# $Id: configure,v 1.443.26.6 2009/03/13 05:35:43 marka Exp $
 #
 # Portions Copyright (C) 1996-2001  Nominum, Inc.
 #
@@ -29,7 +29,7 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# From configure.in Revision: 1.457.26.8 .
+# From configure.in Revision: 1.457.26.9 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.62.
 #
@@ -1751,7 +1751,7 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-libbind       deprecated
   --enable-kqueue         use BSD kqueue when available [default=yes]
-  --enable-epoll          use Linux epoll when available [default=yes]
+  --enable-epoll          use Linux epoll when available [default=auto]
   --enable-devpoll        use /dev/poll when available [default=yes]
   --enable-openssl-version-check
                           Check OpenSSL Version [default=yes]
@@ -22012,11 +22012,11 @@ esac
 if test "${enable_epoll+set}" = set; then
   enableval=$enable_epoll; want_epoll="$enableval"
 else
-  want_epoll="yes"
+  want_epoll="auto"
 fi
 
 case $want_epoll in
-yes)
+auto)
        { $as_echo "$as_me:$LINENO: checking epoll support" >&5
 $as_echo_n "checking epoll support... " >&6; }
        if test "$cross_compiling" = yes; then
@@ -22081,6 +22081,9 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$a
 fi
 
 
+       ;;
+yes)
+       ISC_PLATFORM_HAVEEPOLL="#define ISC_PLATFORM_HAVEEPOLL 1"
        ;;
 *)
        ISC_PLATFORM_HAVEEPOLL="#undef ISC_PLATFORM_HAVEEPOLL"

diff --git a/configure.in b/configure.in
index f44c128e14a71b7fd4794b7b88743d86bd2b0f8f..6ebdfddcca2f430501383d0e938167779c3cf51b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.457.26.8 $)
+AC_REVISION($Revision: 1.457.26.9 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -367,10 +367,10 @@ AC_SUBST(ISC_PLATFORM_HAVEKQUEUE)
 # so we need to try running the code, not just test its existence.
 #
 AC_ARG_ENABLE(epoll,
-       [  --enable-epoll          use Linux epoll when available [[default=yes]]],
-             want_epoll="$enableval",  want_epoll="yes")
+[  --enable-epoll          use Linux epoll when available [[default=auto]]],
+             want_epoll="$enableval",  want_epoll="auto")
 case $want_epoll in
-yes)
+auto)
        AC_MSG_CHECKING(epoll support)
        AC_TRY_RUN([
 #include <sys/epoll.h>
@@ -385,6 +385,9 @@ int main() {
        [AC_MSG_RESULT(no)
        ISC_PLATFORM_HAVEEPOLL="#undef ISC_PLATFORM_HAVEEPOLL"])
        ;;
+yes)
+       ISC_PLATFORM_HAVEEPOLL="#define ISC_PLATFORM_HAVEEPOLL 1"
+       ;;
 *)
        ISC_PLATFORM_HAVEEPOLL="#undef ISC_PLATFORM_HAVEEPOLL"
        ;;