diff options
author | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2005-05-06 14:30:57 +0000 |
---|---|---|
committer | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2005-05-06 14:30:57 +0000 |
commit | efa6a11b8ea380de317e5a89149345789c364c06 (patch) | |
tree | 8582355567c6f9ec9a05ff2e8c079726bfc0e5d8 | |
parent | d3b373696145a6244ca7cba11328771dca589d49 (diff) | |
download | libapr-efa6a11b8ea380de317e5a89149345789c364c06.tar.gz |
Merge r168607 from trunk:
Committed to 0.9.x but missing from HEAD:
* build/apr_hints.m4 (APR_PRELOAD): NetBSD fcntl() confounds
O_NONBLOCK inheritance test, so work around it.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.1.x@168609 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | build/apr_hints.m4 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build/apr_hints.m4 b/build/apr_hints.m4 index 15c470c69..437d294a6 100644 --- a/build/apr_hints.m4 +++ b/build/apr_hints.m4 @@ -152,6 +152,8 @@ dnl # Not a problem in 10.20. Otherwise, who knows? ;; *-netbsd*) APR_ADDTO(CPPFLAGS, [-DNETBSD]) + # fcntl() lies about O_NONBLOCK on an accept()ed socket (PR kern/26950) + APR_SETIFNULL(ac_cv_o_nonblock_inherited, [yes]) ;; *-freebsd*) APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE]) |