diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-02-17 20:53:12 +0300 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-02-17 20:53:12 +0300 |
| commit | 9139cd23517a14e299ec96c675e8c9f96accf6bf (patch) | |
| tree | 31178f999df55f55d6376dfe1bd8dc3aea183e3f /auto | |
| parent | 7b6062a1b8f1f5d1b56deaad17aacde6f97b58c5 (diff) | |
nginx-0.0.2-2004-02-17-20:53:12 import
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/modules | 21 | ||||
| -rw-r--r-- | auto/options | 6 | ||||
| -rw-r--r-- | auto/os/freebsd | 3 | ||||
| -rw-r--r-- | auto/sources | 4 |
4 files changed, 24 insertions, 10 deletions
diff --git a/auto/modules b/auto/modules index dc3d1d3ce..6a1db63dc 100644 --- a/auto/modules +++ b/auto/modules @@ -1,4 +1,10 @@ +if [ $EVENT_RTSIG = YES ]; then + have=HAVE_RTSIG . auto/have + EVENT_MODULES="$EVENT_MODULES $RTSIG_MODULE" + CORE_SRCS="$CORE_SRCS $RTSIG_SRCS" +fi + if [ $EVENT_SELECT = NO -a $EVENT_FOUND = NO ]; then EVENT_SELECT=YES fi @@ -20,21 +26,24 @@ fi if [ $TEST_BUILD_DEVPOLL = YES ]; then - CFLAGS="$CFLAGS -D HAVE_DEVPOLL=1 -D TEST_BUILD_DEVPOLL=1" + have=HAVE_DEVPOLL . auto/have + have=TEST_BUILD_DEVPOLL . auto/have EVENT_MODULES="$EVENT_MODULES $DEVPOLL_MODULE" CORE_SRCS="$CORE_SRCS $DEVPOLL_SRCS" fi if [ $TEST_BUILD_EPOLL = YES ]; then - CFLAGS="$CFLAGS -D HAVE_EPOLL=1 -D TEST_BUILD_EPOLL=1" + have=HAVE_EPOLL . auto/have + have=TEST_BUILD_EPOLL . auto/have EVENT_MODULES="$EVENT_MODULES $EPOLL_MODULE" CORE_SRCS="$CORE_SRCS $EPOLL_SRCS" fi -if [ $TEST_BUILD_SIGIO = YES ]; then - CFLAGS="$CFLAGS -D HAVE_SIGIO=1 -D TEST_BUILD_SIGIO=1" - EVENT_MODULES="$EVENT_MODULES $SIGIO_MODULE" - CORE_SRCS="$CORE_SRCS $SIGIO_SRCS" +if [ $TEST_BUILD_RTSIG = YES ]; then + have=HAVE_RTSIG . auto/have + have=TEST_BUILD_RTSIG . auto/have + EVENT_MODULES="$EVENT_MODULES $RTSIG_MODULE" + CORE_SRCS="$CORE_SRCS $RTSIG_SRCS" fi diff --git a/auto/options b/auto/options index 76f0e367a..9804b2b2d 100644 --- a/auto/options +++ b/auto/options @@ -6,10 +6,11 @@ OBJS=objs TEST_BUILD_DEVPOLL=NO TEST_BUILD_EPOLL=NO -TEST_BUILD_SIGIO=NO +TEST_BUILD_RTSIG=NO EVENT_FOUND=NO +EVENT_RTSIG=NO EVENT_SELECT=NO EVENT_POLL=NO EVENT_AIO=NO @@ -43,6 +44,7 @@ do --builddir=*) OBJS="$value" ;; + --with-rtsig_module) EVENT_RTSIG=YES ;; --with-select_module) EVENT_SELECT=YES ;; --without-select_module) EVENT_SELECT=NONE ;; --with-poll_module) EVENT_POLL=YES ;; @@ -63,7 +65,7 @@ do --test-build-devpoll) TEST_BUILD_DEVPOLL=YES ;; --test-build-epoll) TEST_BUILD_EPOLL=YES ;; - --test-build-sigio) TEST_BUILD_SIGIO=YES ;; + --test-build-rtsig) TEST_BUILD_RTSIG=YES ;; *) echo "$0: error: invalid option \"$option\"" diff --git a/auto/os/freebsd b/auto/os/freebsd index 0835b745c..b8c524ae3 100644 --- a/auto/os/freebsd +++ b/auto/os/freebsd @@ -4,6 +4,9 @@ CORE_DEPS="$UNIX_DEPS $FREEBSD_DEPS" CORE_SRCS="$UNIX_SRCS $FREEBSD_SRCS" +# __FreeBSD_version is the best way to learn when +# some capability appeared or became safe to use + version=`grep "#define __FreeBSD_version" /usr/include/osreldate.h \ | sed -e 's/^.* \(.*\)$/\1/'` diff --git a/auto/sources b/auto/sources index 239160649..81ba968f2 100644 --- a/auto/sources +++ b/auto/sources @@ -76,8 +76,8 @@ DEVPOLL_SRCS=src/event/modules/ngx_devpoll_module.c EPOLL_MODULE=ngx_epoll_module EPOLL_SRCS=src/event/modules/ngx_epoll_module.c -SIGIO_MODULE=ngx_sigio_module -SIGIO_SRCS=src/event/modules/ngx_sigio_module.c +RTSIG_MODULE=ngx_rtsig_module +RTSIG_SRCS=src/event/modules/ngx_rtsig_module.c IOCP_MODULE=ngx_iocp_module IOCP_SRCS=src/event/modules/ngx_iocp_module.c |