diff options
Diffstat (limited to '')
| -rw-r--r-- | auto/os/conf | 37 | ||||
| -rw-r--r-- | auto/os/linux | 2 | ||||
| -rw-r--r-- | auto/os/solaris | 4 |
3 files changed, 35 insertions, 8 deletions
diff --git a/auto/os/conf b/auto/os/conf index 737519938..8c4739fbf 100644 --- a/auto/os/conf +++ b/auto/os/conf @@ -12,11 +12,12 @@ if test -z "$NGX_PLATFORM"; then echo " + $NGX_SYSTEM $NGX_RELEASE $NGX_MACHINE" NGX_PLATFORM="$NGX_SYSTEM:$NGX_RELEASE:$NGX_MACHINE"; + else echo "building for $NGX_PLATFORM" fi -case $NGX_PLATFORM in +case "$NGX_PLATFORM" in FreeBSD:* | DragonFly:*) . auto/os/freebsd @@ -43,7 +44,7 @@ case $NGX_PLATFORM in esac -case $NGX_MACHINE in +case "$NGX_MACHINE" in i386|i686|i86pc|amd64) have=NGX_HAVE_NONALIGNED . auto/have @@ -52,7 +53,7 @@ case $NGX_MACHINE in esac -if [ $NGX_PLATFORM != win32 ]; then +if [ "$NGX_PLATFORM" != win32 ]; then NGX_USER=${NGX_USER:-nobody} @@ -77,6 +78,24 @@ if [ $NGX_PLATFORM != win32 ]; then fi + ngx_feature="poll()" + ngx_feature_name= + ngx_feature_run=no + ngx_feature_incs="#include <poll.h>" + ngx_feature_libs= + ngx_feature_test="int n, dp; struct pollfd pl; + dp = 0; + pl.fd = 0; + pl.events = 0; + pl.revents = 0; + n = poll(&pl, 1, 0)" + . auto/feature + + if [ $ngx_found = no ]; then + EVENT_POLL=NONE + fi + + ngx_feature="/dev/poll" ngx_feature_name="NGX_HAVE_DEVPOLL" ngx_feature_run=no @@ -124,14 +143,22 @@ if [ $NGX_PLATFORM != win32 ]; then fi fi - if [ NGX_SYSTEM != "NetBSD" ]; then + if [ "$NGX_SYSTEM" = "NetBSD" ]; then # NetBSD 2.0 incompatibly defines kevent.udata as "intptr_t" + + cat << END >> $NGX_AUTO_CONFIG_H + +#define NGX_KQUEUE_UDATA_T + +END + + else cat << END >> $NGX_AUTO_CONFIG_H #define NGX_KQUEUE_UDATA_T (void *) END - fi + fi fi diff --git a/auto/os/linux b/auto/os/linux index 8c140b388..a83c1803b 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -18,7 +18,7 @@ EVENT_MODULES="$EVENT_MODULES" ngx_spacer=' ' -CC_AUX_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" +CC_AUX_FLAGS="$CC_AUX_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" # Linux kernel version diff --git a/auto/os/solaris b/auto/os/solaris index 723ad84c3..2348c8985 100644 --- a/auto/os/solaris +++ b/auto/os/solaris @@ -20,10 +20,10 @@ CORE_LIBS="$CORE_LIBS -lsocket -lnsl -lrt" # Solaris's make does not support a blank line between target and rules ngx_spacer= -CC_AUX_FLAGS="-D_FILE_OFFSET_BITS=64 -lrt" +CC_AUX_FLAGS="$CC_AUX_FLAGS -D_FILE_OFFSET_BITS=64 -lrt" -case $NGX_PLATFORM in +case "$NGX_PLATFORM" in *:sun4u) # "-mcpu=v9" enables the "casa" assembler instruction |