forward-port part of r781073 from the 1.3.x branch

as in 1.3.x, kqueue() is disabled
poll() use is unchanged
  in my testing, poll() use is okay in 1.4.x and trunk because the wakeup pipe support
  added in 1.4.x has a side-effect of working around OS X poll() bogosity


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@782430 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 6 deletions

diff --git a/build/apr_hints.m4 b/build/apr_hints.m4
index 626e22e37..3b2ba48c4 100644
--- a/build/apr_hints.m4
+++ b/build/apr_hints.m4
@@ -194,14 +194,15 @@ dnl	       # Not a problem in 10.20.  Otherwise, who knows?
     *-apple-darwin*)
         APR_ADDTO(CPPFLAGS, [-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp])
         APR_SETIFNULL(apr_posixsem_is_global, [yes])
-        # kqueue works in 10.5/Darwin 9.x. Disable on all older versions.
         case $host in
+            *-apple-darwin*)
+	        # APR's use of kqueue has triggered kernel panics for some
+                # 10.5.x (Darwin 9.x) users when running the entire test suite.
+                # In 10.4.x, use of kqueue would cause the socket tests to hang.
+                APR_SETIFNULL(ac_cv_func_kqueue, [no]) 
+                ;;
             *-apple-darwin[[0-8]].*)
-            # kqueue is broken on OS X, the poll tests work, but the socket tests
-            # hang when it's turned on.  if you decide to reenable this please be
-            # sure to test that ALL the tests continue to work with it turned on.
-            APR_SETIFNULL(ac_cv_func_kqueue, [no]) 
-            APR_SETIFNULL(ac_cv_func_poll, [no]) # See issue 34332
+                APR_SETIFNULL(ac_cv_func_poll, [no]) # See issue 34332
             ;;
         esac
 	;;