diff options
author | Joe Orton <jorton@apache.org> | 2005-05-06 14:30:32 +0000 |
---|---|---|
committer | Joe Orton <jorton@apache.org> | 2005-05-06 14:30:32 +0000 |
commit | 0b8d5e9875e0cedd0131c1a0101222b70415207d (patch) | |
tree | 5e1994f0e1fd2444d8c466a5774d8abc0f222e76 | |
parent | 36430fd1d56d31c8dab6b830b829999c6b4afb2d (diff) | |
download | apr-0b8d5e9875e0cedd0131c1a0101222b70415207d.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: https://svn.apache.org/repos/asf/apr/apr/branches/1.0.x@168608 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 edd5f9770..72bb26148 100644 --- a/build/apr_hints.m4 +++ b/build/apr_hints.m4 @@ -137,6 +137,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]) |