aboutsummaryrefslogtreecommitdiff
path: root/auto/os
diff options
context:
space:
mode:
Diffstat (limited to 'auto/os')
-rw-r--r--auto/os/conf20
-rw-r--r--auto/os/freebsd12
-rw-r--r--auto/os/linux14
-rw-r--r--auto/os/solaris5
-rw-r--r--auto/os/win324
5 files changed, 26 insertions, 29 deletions
diff --git a/auto/os/conf b/auto/os/conf
index 5dcf400da..568b718d2 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -2,7 +2,7 @@
# Copyright (C) Igor Sysoev
-if [ ".$PLATFORM" = "." ]; then
+if test -z "$NGX_PLATFORM"; then
echo "checking for OS"
SYSTEM=`uname -s 2>/dev/null`
@@ -11,12 +11,12 @@ if [ ".$PLATFORM" = "." ]; then
echo " + $SYSTEM $RELEASE $MACHINE"
- PLATFORM="$SYSTEM:$RELEASE:$MACHINE";
+ NGX_PLATFORM="$SYSTEM:$RELEASE:$MACHINE";
else
- echo "building for $PLATFORM"
+ echo "building for $NGX_PLATFORM"
fi
-case $PLATFORM in
+case $NGX_PLATFORM in
FreeBSD:* | DragonFly:*)
. auto/os/freebsd
@@ -43,7 +43,7 @@ case $PLATFORM in
esac
-if [ $PLATFORM != win32 ]; then
+if [ $NGX_PLATFORM != win32 ]; then
if test -z "$NGX_USER"; then
NGX_USER=nobody
@@ -52,7 +52,7 @@ if [ $PLATFORM != win32 ]; then
ngx_feature="/dev/poll"
- ngx_feature_name="devpoll"
+ ngx_feature_name="NGX_HAVE_DEVPOLL"
ngx_feature_run=no
ngx_feature_incs="#include <sys/devpoll.h>"
ngx_feature_libs=
@@ -65,7 +65,6 @@ if [ $PLATFORM != win32 ]; then
. auto/feature
if [ $ngx_found = yes ]; then
- have=HAVE_DEVPOLL . auto/have
CORE_SRCS="$CORE_SRCS $DEVPOLL_SRCS"
EVENT_MODULES="$EVENT_MODULES $DEVPOLL_MODULE"
EVENT_FOUND=YES
@@ -74,7 +73,7 @@ if [ $PLATFORM != win32 ]; then
if test -z "$NGX_KQUEUE_CHECKED"; then
ngx_feature="kqueue"
- ngx_feature_name="kqueue"
+ ngx_feature_name="NGX_HAVE_KQUEUE"
ngx_feature_run=no
ngx_feature_incs="#include <sys/event.h>"
ngx_feature_libs=
@@ -83,14 +82,13 @@ if [ $PLATFORM != win32 ]; then
if [ $ngx_found = yes ]; then
- have=HAVE_KQUEUE . auto/have
- have=HAVE_CLEAR_EVENT . auto/have
+ have=NGX_HAVE_CLEAR_EVENT . auto/have
EVENT_MODULES="$EVENT_MODULES $KQUEUE_MODULE"
CORE_SRCS="$CORE_SRCS $KQUEUE_SRCS"
EVENT_FOUND=YES
ngx_feature="kqueue's NOTE_LOWAT"
- ngx_feature_name="HAVE_LOWAT_EVENT"
+ ngx_feature_name="NGX_HAVE_LOWAT_EVENT"
ngx_feature_run=no
ngx_feature_incs="#include <sys/event.h>"
ngx_feature_libs=
diff --git a/auto/os/freebsd b/auto/os/freebsd
index ba2e18805..e35b933af 100644
--- a/auto/os/freebsd
+++ b/auto/os/freebsd
@@ -45,7 +45,7 @@ fi
if [ $osreldate -gt 300007 ]; then
echo " + using sendfile()"
- have=HAVE_SENDFILE . auto/have
+ have=NGX_HAVE_SENDFILE . auto/have
CORE_SRCS="$CORE_SRCS $FREEBSD_SENDFILE_SRCS"
fi
@@ -57,8 +57,8 @@ if [ \( $osreldate -lt 500000 -a $osreldate -ge 410000 \) \
then
echo " + using kqueue"
- have=HAVE_KQUEUE . auto/have
- have=HAVE_CLEAR_EVENT . auto/have
+ have=NGX_HAVE_KQUEUE . auto/have
+ have=NGX_HAVE_CLEAR_EVENT . auto/have
EVENT_MODULES="$EVENT_MODULES $KQUEUE_MODULE"
CORE_SRCS="$CORE_SRCS $KQUEUE_SRCS"
EVENT_FOUND=YES
@@ -73,7 +73,7 @@ if [ \( $version -lt 500000 -a $version -ge 430000 \) \
-o $version -ge 500018 ]
then
echo " + using kqueue's NOTE_LOWAT"
- have=HAVE_LOWAT_EVENT . auto/have
+ have=NGX_HAVE_LOWAT_EVENT . auto/have
fi
@@ -85,7 +85,7 @@ if [ $USE_THREADS = "rfork" ]; then
#
# if [ $version -gt 460101 ]; then
# echo " + kqueue's EVFILT_SIGNAL is safe"
-# have=HAVE_SAFE_EVFILT_SIGNAL . auto/have
+# have=NGX_HAVE_SAFE_EVFILT_SIGNAL . auto/have
# else
# echo "$0: error: the kqueue's EVFILT_SIGNAL is unsafe on this"
# echo "FreeBSD version, so --with-threads=rfork could not be used"
@@ -100,7 +100,7 @@ if [ $EVENT_AIO = YES ]; then
if [ \( $version -lt 500000 -a $version -ge 430000 \) \
-o $version -ge 500014 ]
then
- have=HAVE_AIO . auto/have
+ have=NGX_HAVE_AIO . auto/have
EVENT_MODULES="$EVENT_MODULES $AIO_MODULE"
CORE_SRCS="$CORE_SRCS $AIO_SRCS"
else
diff --git a/auto/os/linux b/auto/os/linux
index e4cbd6d03..687377b6e 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -37,7 +37,8 @@ version=`grep "#define LINUX_VERSION_CODE" /usr/include/linux/version.h \
if [ $version -ge 131609 -o $EVENT_RTSIG = YES ]; then
echo " + using rt signals"
- have=HAVE_RTSIG . auto/have
+ have=NGX_HAVE_RTSIG . auto/have
+ have=NGX_HAVE_POLL . auto/have
EVENT_MODULES="$EVENT_MODULES $RTSIG_MODULE"
CORE_SRCS="$CORE_SRCS $RTSIG_SRCS"
EVENT_FOUND=YES
@@ -47,7 +48,7 @@ fi
# epoll, EPOLLET version
ngx_feature="epoll"
-ngx_feature_name="epoll"
+ngx_feature_name="NGX_HAVE_EPOLL"
ngx_feature_run=no
ngx_feature_incs="#include <sys/epoll.h>"
ngx_feature_libs=
@@ -60,8 +61,7 @@ ngx_feature_test="int efd = 0, fd = 1, n;
. auto/feature
if [ $ngx_found = yes ]; then
- have=HAVE_EPOLL . auto/have
- have=HAVE_CLEAR_EVENT . auto/have
+ have=NGX_HAVE_CLEAR_EVENT . auto/have
CORE_SRCS="$CORE_SRCS $EPOLL_SRCS"
EVENT_MODULES="$EVENT_MODULES $EPOLL_MODULE"
EVENT_FOUND=YES
@@ -72,7 +72,7 @@ fi
CC_AUX_FLAGS="-D_GNU_SOURCE"
ngx_feature="sendfile()"
-ngx_feature_name="sendfile"
+ngx_feature_name="NGX_HAVE_SENDFILE"
ngx_feature_run=no
ngx_feature_incs="#include <sys/sendfile.h>"
ngx_feature_libs=
@@ -90,7 +90,7 @@ fi
CC_AUX_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
ngx_feature="sendfile64()"
-ngx_feature_name="HAVE_SENDFILE64"
+ngx_feature_name="NGX_HAVE_SENDFILE64"
ngx_feature_run=no
ngx_feature_incs="#include <sys/sendfile.h>"
ngx_feature_libs=
@@ -105,7 +105,7 @@ ngx_include="sys/prctl.h"; . auto/include
# prctl(PR_SET_DUMPABLE)
ngx_feature="prctl(PR_SET_DUMPABLE)"
-ngx_feature_name="HAVE_PR_SET_DUMPABLE"
+ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
ngx_feature_run=yes
ngx_feature_incs="#include <sys/prctl.h>"
ngx_feature_libs=
diff --git a/auto/os/solaris b/auto/os/solaris
index 62708cd10..723ad84c3 100644
--- a/auto/os/solaris
+++ b/auto/os/solaris
@@ -23,7 +23,7 @@ ngx_spacer=
CC_AUX_FLAGS="-D_FILE_OFFSET_BITS=64 -lrt"
-case $PLATFORM in
+case $NGX_PLATFORM in
*:sun4u)
# "-mcpu=v9" enables the "casa" assembler instruction
@@ -43,7 +43,7 @@ fi
ngx_feature="sendfilev()"
-ngx_feature_name="sendfile"
+ngx_feature_name="NGX_HAVE_SENDFILE"
ngx_feature_run=no
ngx_feature_incs="#include <sys/sendfile.h>"
ngx_feature_libs="-lsendfile"
@@ -54,7 +54,6 @@ ngx_feature_test="int fd = 1; sendfilevec_t vec[1];
if [ $ngx_found = yes ]; then
- have=HAVE_SENDFILE . auto/have
CORE_SRCS="$CORE_SRCS $SOLARIS_SENDFILEV_SRCS"
CORE_LIBS="$CORE_LIBS -lsendfile"
fi
diff --git a/auto/os/win32 b/auto/os/win32
index dfbb246c8..5567535c2 100644
--- a/auto/os/win32
+++ b/auto/os/win32
@@ -26,5 +26,5 @@ if [ $EVENT_SELECT = NO ]; then
EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE"
fi
-have=HAVE_AIO . auto/have
-have=HAVE_IOCP . auto/have
+have=NGX_HAVE_AIO . auto/have
+have=NGX_HAVE_IOCP . auto/have
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 17:55:51 +0000