diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2015-02-11 20:00:07 +0300 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2015-02-11 20:00:07 +0300 |
| commit | 0a3d458805ff64c0778ad4c081ce9cc0dee4aa01 (patch) | |
| tree | 75265be19b93bdcca66edf38285f1378c8d06b0d /auto/os | |
| parent | 2b8d6ad805a0132844cfbc1cf1c6988dfe8c9973 (diff) | |
| download | nginx-0a3d458805ff64c0778ad4c081ce9cc0dee4aa01.tar.gz nginx-0a3d458805ff64c0778ad4c081ce9cc0dee4aa01.tar.bz2 | |
Unbreak building on FreeBSD without file AIO.
It appeared that the NGX_HAVE_AIO_SENDFILE macro was defined regardless of
the "--with-file-aio" configure option and the NGX_HAVE_FILE_AIO macro.
Now they are related.
Additionally, fixed one macro.
Diffstat (limited to 'auto/os')
| -rw-r--r-- | auto/os/freebsd | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/auto/os/freebsd b/auto/os/freebsd index 6aa823f92..22ad40363 100644 --- a/auto/os/freebsd +++ b/auto/os/freebsd @@ -44,10 +44,12 @@ if [ $osreldate -gt 300007 ]; then CORE_SRCS="$CORE_SRCS $FREEBSD_SENDFILE_SRCS" fi -if [ $osreldate -gt 502103 ]; then - echo " + sendfile()'s SF_NODISKIO found" +if [ $NGX_FILE_AIO = YES ]; then + if [ $osreldate -gt 502103 ]; then + echo " + sendfile()'s SF_NODISKIO found" - have=NGX_HAVE_AIO_SENDFILE . auto/have + have=NGX_HAVE_AIO_SENDFILE . auto/have + fi fi # POSIX semaphores |