diff options
Diffstat (limited to '')
| -rw-r--r-- | auto/os/conf | 6 | ||||
| -rw-r--r-- | auto/os/linux | 7 | ||||
| -rw-r--r-- | auto/os/win32 | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/auto/os/conf b/auto/os/conf index 5154f2bba..5dcf400da 100644 --- a/auto/os/conf +++ b/auto/os/conf @@ -45,6 +45,12 @@ esac if [ $PLATFORM != win32 ]; then + if test -z "$NGX_USER"; then + NGX_USER=nobody + NGX_GROUP=nobody + fi + + ngx_feature="/dev/poll" ngx_feature_name="devpoll" ngx_feature_run=no diff --git a/auto/os/linux b/auto/os/linux index e68a0d27d..8518c6170 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -20,6 +20,13 @@ ngx_spacer=' CC_AUX_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" + +if test -z "$NGX_USER"; then + NGX_USER=nobody + NGX_GROUP=nogroup +fi + + # Linux kernel version version=`grep "#define LINUX_VERSION_CODE" /usr/include/linux/version.h \ diff --git a/auto/os/win32 b/auto/os/win32 index 9e83e67fe..dfbb246c8 100644 --- a/auto/os/win32 +++ b/auto/os/win32 @@ -15,7 +15,8 @@ CORE_INCS="$WIN32_INCS" CORE_DEPS="$WIN32_DEPS" CORE_SRCS="$WIN32_SRCS $IOCP_SRCS" OS_CONFIG="$WIN32_CONFIG" -CORE_LIBS="$CORE_LIBS ws2_32.lib" +CORE_LIBS="$CORE_LIBS shell32.lib ws2_32.lib" +NGX_ICONS="$NGX_WIN32_ICONS" EVENT_MODULES="$EVENT_MODULES $IOCP_MODULE" EVENT_FOUND=YES |