apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r387607 - /apr/apr/branches/1.2.x/build/apr_hints.m4
Date Tue, 21 Mar 2006 19:40:38 GMT
Author: rooneg
Date: Tue Mar 21 11:40:35 2006
New Revision: 387607

URL: http://svn.apache.org/viewcvs?rev=387607&view=rev
Log:
Merge r387603 from trunk to the 1.2.x branch.

Original log message:

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.

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=387607&r1=387606&r2=387607&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/build/apr_hints.m4 (original)
+++ apr/apr/branches/1.2.x/build/apr_hints.m4 Tue Mar 21 11:40:35 2006
@@ -187,21 +187,14 @@
 	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])



Mime
View raw message