diff options
| author | rooneg <rooneg@13f79535-47bb-0310-9956-ffa450edef68> | 2006-03-15 22:54:59 +0000 |
|---|---|---|
| committer | rooneg <rooneg@13f79535-47bb-0310-9956-ffa450edef68> | 2006-03-15 22:54:59 +0000 |
| commit | 6fa61ed5be04343ec890475e3530dbcb4a247753 (patch) | |
| tree | a7d2b67b96282ebbf277653dd49e4d096c3013a8 | |
| parent | 27f7d2a7a397cda963f6a7389de686a104132f29 (diff) | |
| download | libapr-6fa61ed5be04343ec890475e3530dbcb4a247753.tar.gz | |
* build/apr_hints.m4: Reenable kqueue on current versions of Mac OS X,
as it seems to work now that we've fixed the bug in our kqueue code.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@386202 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build/apr_hints.m4 | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/build/apr_hints.m4 b/build/apr_hints.m4 index eef922ea9..0ec8748a8 100644 --- a/build/apr_hints.m4 +++ b/build/apr_hints.m4 @@ -187,11 +187,21 @@ 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 - # Broken in 10.4.x - APR_SETIFNULL(ac_cv_func_kqueue, [no]) + + # 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 ;; *-dec-osf*) APR_ADDTO(CPPFLAGS, [-DOSF1]) |