svn commit: r386409 - /apr/apr/branches/1.2.x/build/apr_hints.m4

[ro...@apache.org]

Author: rooneg
Date: Thu Mar 16 10:27:52 2006
New Revision: 386409

URL: http://svn.apache.org/viewcvs?rev=386409&view=rev
Log:
Merge r386202 from trunk into the 1.2.x branch.

Original log message:

* 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.

Modified:
    apr/apr/branches/1.2.x/build/apr_hints.m4

Modified: apr/apr/branches/1.2.x/build/apr_hints.m4
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/build/apr_hints.m4?rev=386409&r1=386408&r2=386409&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/build/apr_hints.m4 (original)
+++ apr/apr/branches/1.2.x/build/apr_hints.m4 Thu Mar 16 10:27:52 2006
@@ -187,11 +187,21 @@
 	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])