diff options
Diffstat (limited to 'auto/os')
| -rw-r--r-- | auto/os/conf | 17 | ||||
| -rw-r--r-- | auto/os/freebsd | 10 | ||||
| -rw-r--r-- | auto/os/linux | 8 | ||||
| -rw-r--r-- | auto/os/solaris | 8 | ||||
| -rw-r--r-- | auto/os/win32 | 9 |
5 files changed, 18 insertions, 34 deletions
diff --git a/auto/os/conf b/auto/os/conf index b48b6404d..f2a49cee5 100644 --- a/auto/os/conf +++ b/auto/os/conf @@ -23,6 +23,15 @@ case "$NGX_PLATFORM" in . auto/os/freebsd ;; + Darwin:*) + have=NGX_DARWIN . auto/have_headers + have=NGX_HAVE_INHERITED_NONBLOCK . auto/have + CORE_INCS="$UNIX_INCS" + CORE_DEPS="$UNIX_DEPS $POSIX_DEPS" + CORE_SRCS="$UNIX_SRCS" + CRYPT_LIB= + ;; + Linux:*) . auto/os/linux ;; @@ -47,16 +56,16 @@ esac case "$NGX_MACHINE" in - i386|i686|i86pc|amd64) - have=NGX_HAVE_NONALIGNED . auto/have - ;; + i386|i686|i86pc|amd64) + have=NGX_HAVE_NONALIGNED . auto/have + ;; esac if [ "$NGX_PLATFORM" != win32 ]; then - NGX_USER=${NGX_USER:-nobody} + NGX_USER=${NGX_USER:-nobody} if [ -z "$NGX_GROUP" -a $NGX_USER = nobody ] ; then if grep nobody /etc/group 2>&1 >/dev/null; then diff --git a/auto/os/freebsd b/auto/os/freebsd index 133f5f55b..f916860d9 100644 --- a/auto/os/freebsd +++ b/auto/os/freebsd @@ -2,14 +2,7 @@ # Copyright (C) Igor Sysoev -cat << END >> $NGX_AUTO_HEADERS_H - -#ifndef NGX_FREEBSD -#define NGX_FREEBSD 1 -#endif - -END - +have=NGX_FREEBSD . auto/have_headers CORE_INCS="$UNIX_INCS" CORE_DEPS="$UNIX_DEPS $FREEBSD_DEPS" @@ -39,6 +32,7 @@ then echo " + setproctitle() in libutil" CORE_LIBS="$CORE_LIBS -lutil" + NGX_SETPROCTITLE_LIB="-lutil" fi # sendfile diff --git a/auto/os/linux b/auto/os/linux index 84e4f6667..5926211a4 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -2,13 +2,7 @@ # Copyright (C) Igor Sysoev -cat << END >> $NGX_AUTO_HEADERS_H - -#ifndef NGX_LINUX -#define NGX_LINUX 1 -#endif - -END +have=NGX_LINUX . auto/have_headers CORE_INCS="$UNIX_INCS" CORE_DEPS="$UNIX_DEPS $LINUX_DEPS" diff --git a/auto/os/solaris b/auto/os/solaris index 67e0a8e6b..cf7fc6c84 100644 --- a/auto/os/solaris +++ b/auto/os/solaris @@ -2,13 +2,7 @@ # Copyright (C) Igor Sysoev -cat << END >> $NGX_AUTO_HEADERS_H - -#ifndef NGX_SOLARIS -#define NGX_SOLARIS 1 -#endif - -END +have=NGX_SOLARIS . auto/have_headers CORE_INCS="$UNIX_INCS" CORE_DEPS="$UNIX_DEPS $SOLARIS_DEPS" diff --git a/auto/os/win32 b/auto/os/win32 index 5567535c2..f65f2c9a4 100644 --- a/auto/os/win32 +++ b/auto/os/win32 @@ -2,14 +2,7 @@ # Copyright (C) Igor Sysoev -cat << END >> $NGX_AUTO_HEADERS_H - -#ifndef NGX_WIN32 -#define NGX_WIN32 1 -#endif - -END - +have=NGX_WIN32 . auto/have_headers CORE_INCS="$WIN32_INCS" CORE_DEPS="$WIN32_DEPS" |