diff options
Diffstat (limited to 'auto/os')
| -rw-r--r-- | auto/os/freebsd | 3 | ||||
| -rw-r--r-- | auto/os/linux | 16 | ||||
| -rw-r--r-- | auto/os/solaris | 9 |
3 files changed, 15 insertions, 13 deletions
diff --git a/auto/os/freebsd b/auto/os/freebsd index ee6854347..0835b745c 100644 --- a/auto/os/freebsd +++ b/auto/os/freebsd @@ -1,11 +1,8 @@ - CORE_INCS="$UNIX_INCS" CORE_DEPS="$UNIX_DEPS $FREEBSD_DEPS" CORE_SRCS="$UNIX_SRCS $FREEBSD_SRCS" -MD5_LIB="-lmd" -ZLIB_LIB="-lz" version=`grep "#define __FreeBSD_version" /usr/include/osreldate.h \ | sed -e 's/^.* \(.*\)$/\1/'` diff --git a/auto/os/linux b/auto/os/linux index 3a020e944..b71034cf8 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -4,7 +4,6 @@ CORE_DEPS="$UNIX_DEPS $LINUX_DEPS" CORE_SRCS="$UNIX_SRCS $LINUX_SRCS" EVENT_MODULES="$EVENT_MODULES" -ZLIB_LIB="-lz" CC_TEST_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" @@ -13,7 +12,7 @@ CC_TEST_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" ngx_func="epoll"; ngx_func_inc="#include <sys/epoll.h>" -ngx_func_test="int fd = 1; int n; +ngx_func_test="int efd = 0, fd = 1, n; struct epoll_event ee; ee.events = EPOLLIN|EPOLLOUT|EPOLLET; ee.data.ptr = NULL; @@ -21,7 +20,7 @@ ngx_func_test="int fd = 1; int n; . auto/func if [ $ngx_found = yes ]; then - CFLAGS="$CFLAGS -D HAVE_EPOLL=1" + have=HAVE_EPOLL . auto/have CORE_SRCS="$CORE_SRCS $EPOLL_SRCS" EVENT_MODULES="$EVENT_MODULES $EPOLL_MODULE" EVENT_FOUND=YES @@ -39,7 +38,6 @@ ngx_func_test="int s = 0, fd = 1; . auto/func if [ $ngx_found = yes ]; then - CFLAGS="$CFLAGS -D HAVE_SENDFILE=1" CORE_SRCS="$CORE_SRCS $LINUX_SENDFILE_SRCS" fi @@ -49,6 +47,14 @@ fi CC_TEST_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" ngx_func="sendfile64()"; . auto/func + +# prctl(PR_SET_DUMPABLE) + +ngx_func="prctl()"; +ngx_func_inc="#include <sys/prctl.h>" +ngx_func_test="prctl(PR_SET_DUMPABLE, 1, 0, 0, 0)" +. auto/func + if [ $ngx_found = yes ]; then - CFLAGS="$CFLAGS -D HAVE_SENDFILE64=1" + have=HAVE_PR_SET_DUMPABLE . auto/have fi diff --git a/auto/os/solaris b/auto/os/solaris index 363ac1d2d..dd6c85cab 100644 --- a/auto/os/solaris +++ b/auto/os/solaris @@ -4,17 +4,16 @@ CORE_DEPS="$UNIX_DEPS $SOLARIS_DEPS" CORE_SRCS="$UNIX_SRCS $SOLARIS_SRCS " EVENT_MODULES="$EVENT_MODULES" -MD5_LIB="-lmd5" -ZLIB_LIB="-lz" CORE_LIBS="$CORE_LIBS -lsocket -lnsl" + CC_TEST_FLAGS="-D_FILE_OFFSET_BITS=64" ngx_inc="sys/devpoll.h"; . auto/inc if [ $ngx_found = yes ]; then - CFLAGS="$CFLAGS -D HAVE_DEVPOLL=1" + have=HAVE_DEVPOLL . auto/have CORE_SRCS="$CORE_SRCS $DEVPOLL_SRCS" EVENT_MODULES="$EVENT_MODULES $DEVPOLL_MODULE" EVENT_FOUND=YES @@ -25,13 +24,13 @@ ngx_func="sendfilev()"; ngx_func_inc="#include <sys/sendfile.h>" ngx_func_libs="-lsendfile" ngx_func_test="int fd = 1; sendfilevec_t vec[1]; - size_t sent = 1; ssize_t n; + size_t sent; ssize_t n; n = sendfilev(fd, vec, 1, &sent)" . auto/func if [ $ngx_found = yes ]; then - CFLAGS="$CFLAGS -D HAVE_SENDFILE=1" + have=HAVE_SENDFILE . auto/have CORE_SRCS="$CORE_SRCS $SOLARIS_SENDFILEV_SRCS" CORE_LIBS="$CORE_LIBS -lsendfile" fi |