From 2bd622626f1301238db9f48cc330669644ced69c Mon Sep 17 00:00:00 2001
From: Jeff Trawick <trawick@apache.org>
Date: Sat, 5 Oct 2013 12:44:36 +0000
Subject: [PATCH] Disable event/eventopt if apr skiplist isn't available

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529442 13f79535-47bb-0310-9956-ffa450edef68
---
 server/mpm/config.m4          | 11 +++++++++++
 server/mpm/event/config.m4    |  2 ++
 server/mpm/eventopt/config.m4 |  2 ++
 3 files changed, 15 insertions(+)

diff --git a/server/mpm/config.m4 b/server/mpm/config.m4
index 0b263cbc56..07118bd904 100644
--- a/server/mpm/config.m4
+++ b/server/mpm/config.m4
@@ -38,6 +38,17 @@ AC_CACHE_CHECK([whether APR supports thread-safe pollsets], [ac_cv_have_threadsa
     fi
 ])
 
+dnl See if APR has skiplist
+dnl The base httpd prereq is APR 1.4.x, so we don't have to consider
+dnl earlier versions.
+case $APR_VERSION in
+    1.4*)
+        apr_has_skiplist=no
+        ;;
+    *)
+        apr_has_skiplist=yes
+esac
+
 dnl See if this is a forking platform w.r.t. MPMs
 case $host in
     *mingw32* | *os2-emx*)
diff --git a/server/mpm/event/config.m4 b/server/mpm/event/config.m4
index 351f1acf4b..c891c75805 100644
--- a/server/mpm/event/config.m4
+++ b/server/mpm/event/config.m4
@@ -7,6 +7,8 @@ elif test $have_threaded_sig_graceful != yes; then
     AC_MSG_RESULT(no - SIG_GRACEFUL cannot be used with a threaded MPM)
 elif test $ac_cv_have_threadsafe_pollset != yes; then
     AC_MSG_RESULT(no - APR_POLLSET_THREADSAFE is not supported)
+elif test $apr_has_skiplist != yes; then
+    AC_MSG_RESULT(no - APR skiplist is not available, need APR 1.5.x or later)
 else
     AC_MSG_RESULT(yes)
     APACHE_MPM_SUPPORTED(event, yes, yes)
diff --git a/server/mpm/eventopt/config.m4 b/server/mpm/eventopt/config.m4
index 92f2789a38..1b6c1f8336 100644
--- a/server/mpm/eventopt/config.m4
+++ b/server/mpm/eventopt/config.m4
@@ -5,6 +5,8 @@ elif test $ac_cv_define_APR_HAS_THREADS != yes; then
     AC_MSG_RESULT(no - APR does not support threads)
 elif test $have_threaded_sig_graceful != yes; then
     AC_MSG_RESULT(no - SIG_GRACEFUL cannot be used with a threaded MPM)
+elif test $apr_has_skiplist != yes; then
+    AC_MSG_RESULT(no - APR skiplist is not available, need APR 1.5.x or later)
 else
     AC_MSG_RESULT(yes)
     APACHE_MPM_SUPPORTED(eventopt, yes, yes)
-- 
2.40.0