Mercurial > hg > nginx-vendor-1-0
comparison auto/os/conf @ 42:41ccba1aba45 NGINX_0_1_21
nginx 0.1.21
*) Bugfix: the ngx_http_stub_status_module showed incorrect statistics
if "rtsig" method was used or if several worker process ran on SMP.
*) Bugfix: nginx could not be built by the icc compiler on Linux or if
the zlib-1.2.x library was building from sources.
*) Bugfix: nginx could not be built on NetBSD 2.0.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 22 Feb 2005 00:00:00 +0300 |
parents | 2879cd3a40cb |
children | 0d75d65c642f |
comparison
equal
deleted
inserted
replaced
41:4d8e7a81b3a0 | 42:41ccba1aba45 |
---|---|
10 NGX_MACHINE=`uname -m 2>/dev/null` | 10 NGX_MACHINE=`uname -m 2>/dev/null` |
11 | 11 |
12 echo " + $NGX_SYSTEM $NGX_RELEASE $NGX_MACHINE" | 12 echo " + $NGX_SYSTEM $NGX_RELEASE $NGX_MACHINE" |
13 | 13 |
14 NGX_PLATFORM="$NGX_SYSTEM:$NGX_RELEASE:$NGX_MACHINE"; | 14 NGX_PLATFORM="$NGX_SYSTEM:$NGX_RELEASE:$NGX_MACHINE"; |
15 | |
15 else | 16 else |
16 echo "building for $NGX_PLATFORM" | 17 echo "building for $NGX_PLATFORM" |
17 fi | 18 fi |
18 | 19 |
19 case $NGX_PLATFORM in | 20 case "$NGX_PLATFORM" in |
20 | 21 |
21 FreeBSD:* | DragonFly:*) | 22 FreeBSD:* | DragonFly:*) |
22 . auto/os/freebsd | 23 . auto/os/freebsd |
23 ;; | 24 ;; |
24 | 25 |
41 ;; | 42 ;; |
42 | 43 |
43 esac | 44 esac |
44 | 45 |
45 | 46 |
46 case $NGX_MACHINE in | 47 case "$NGX_MACHINE" in |
47 | 48 |
48 i386|i686|i86pc|amd64) | 49 i386|i686|i86pc|amd64) |
49 have=NGX_HAVE_NONALIGNED . auto/have | 50 have=NGX_HAVE_NONALIGNED . auto/have |
50 ;; | 51 ;; |
51 | 52 |
52 esac | 53 esac |
53 | 54 |
54 | 55 |
55 if [ $NGX_PLATFORM != win32 ]; then | 56 if [ "$NGX_PLATFORM" != win32 ]; then |
56 | 57 |
57 NGX_USER=${NGX_USER:-nobody} | 58 NGX_USER=${NGX_USER:-nobody} |
58 | 59 |
59 if [ -z "$NGX_GROUP" -a $NGX_USER = nobody ] ; then | 60 if [ -z "$NGX_GROUP" -a $NGX_USER = nobody ] ; then |
60 if grep nobody /etc/group 2>&1 >/dev/null; then | 61 if grep nobody /etc/group 2>&1 >/dev/null; then |
72 fi | 73 fi |
73 fi | 74 fi |
74 | 75 |
75 else | 76 else |
76 NGX_GROUP=$NGX_USER | 77 NGX_GROUP=$NGX_USER |
78 fi | |
79 | |
80 | |
81 ngx_feature="poll()" | |
82 ngx_feature_name= | |
83 ngx_feature_run=no | |
84 ngx_feature_incs="#include <poll.h>" | |
85 ngx_feature_libs= | |
86 ngx_feature_test="int n, dp; struct pollfd pl; | |
87 dp = 0; | |
88 pl.fd = 0; | |
89 pl.events = 0; | |
90 pl.revents = 0; | |
91 n = poll(&pl, 1, 0)" | |
92 . auto/feature | |
93 | |
94 if [ $ngx_found = no ]; then | |
95 EVENT_POLL=NONE | |
77 fi | 96 fi |
78 | 97 |
79 | 98 |
80 ngx_feature="/dev/poll" | 99 ngx_feature="/dev/poll" |
81 ngx_feature_name="NGX_HAVE_DEVPOLL" | 100 ngx_feature_name="NGX_HAVE_DEVPOLL" |
122 kev.fflags = NOTE_LOWAT;" | 141 kev.fflags = NOTE_LOWAT;" |
123 . auto/feature | 142 . auto/feature |
124 fi | 143 fi |
125 fi | 144 fi |
126 | 145 |
127 if [ NGX_SYSTEM != "NetBSD" ]; then | 146 if [ "$NGX_SYSTEM" = "NetBSD" ]; then |
128 | 147 |
129 # NetBSD 2.0 incompatibly defines kevent.udata as "intptr_t" | 148 # NetBSD 2.0 incompatibly defines kevent.udata as "intptr_t" |
149 | |
150 cat << END >> $NGX_AUTO_CONFIG_H | |
151 | |
152 #define NGX_KQUEUE_UDATA_T | |
153 | |
154 END | |
155 | |
156 else | |
130 cat << END >> $NGX_AUTO_CONFIG_H | 157 cat << END >> $NGX_AUTO_CONFIG_H |
131 | 158 |
132 #define NGX_KQUEUE_UDATA_T (void *) | 159 #define NGX_KQUEUE_UDATA_T (void *) |
133 | 160 |
134 END | 161 END |
135 | 162 |
136 fi | 163 fi |
137 fi | 164 fi |