summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett Rooney <rooneg@apache.org>2006-03-21 19:15:54 +0000
committerGarrett Rooney <rooneg@apache.org>2006-03-21 19:15:54 +0000
commit3fa0c006ec494a89c20f223fb2c350e8efa380ac (patch)
tree14ddfc25c14050ab303d29007be0bb077ccf22de
parentfab120e7d04ebc054c46ae5e66d30c8591744557 (diff)
downloadapr-3fa0c006ec494a89c20f223fb2c350e8efa380ac.tar.gz
Mac OS X, why do you hate kqueue so much?
* build/apr_hints.m4: Disable kqueue again, it's causing problems with the socket tests. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@387603 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--build/apr_hints.m415
1 files changed, 4 insertions, 11 deletions
diff --git a/build/apr_hints.m4 b/build/apr_hints.m4
index 0ec8748a8..5f313f53c 100644
--- a/build/apr_hints.m4
+++ b/build/apr_hints.m4
@@ -187,21 +187,14 @@ dnl # Not a problem in 10.20. Otherwise, who knows?
APR_ADDTO(CPPFLAGS, [-DRHAPSODY])
;;
*-apple-darwin*)
- if test -x /usr/sbin/sysctl; then
- os_version=`/usr/sbin/sysctl -n kern.osrelease | sed 's/\.//g'`
- else
- os_version=000
- fi
-
APR_ADDTO(CPPFLAGS, [-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp])
APR_SETIFNULL(apr_posixsem_is_global, [yes])
APR_SETIFNULL(ac_cv_func_poll, [no]) # See issue 34332
- # kqueue has been confirmed to work in OS X 10.4.5, its status in
- # earlier OS X releases is not currently known, so it is disabled.
- if test $os_version -lt "850"; then
- APR_SETIFNULL(ac_cv_func_kqueue, [no])
- fi
+ # 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])
;;
*-dec-osf*)
APR_ADDTO(CPPFLAGS, [-DOSF1])