# HG changeset patch
# User Samuel Martin <s.martin49@gmail.com>
# Date 1406932254 -7200
# Sat Aug 02 00:30:54 2014 +0200
# Node ID a0389d32d970bc5740013805bc50d2f1de52aef6
# Parent 0abfd4903c4b440a18ed2de0d8c68e5b163e94f0
auto/*: set ngx_feature_run_force_result for each feature requiring run test
Each feature requiring a run test has a matching preset variable (called
ngx_force_*) used to set ngx_feature_run_force_result.

These ngx_force_* variables are passed through the environment at configure
time.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>

diff -r 0abfd4903c4b -r a0389d32d970 auto/cc/conf
--- a/auto/cc/conf Sat Aug 02 00:30:54 2014 +0200
+++ b/auto/cc/conf Sat Aug 02 00:30:54 2014 +0200
@@ -159,6 +159,7 @@
ngx_feature="gcc builtin atomic operations"
ngx_feature_name=NGX_HAVE_GCC_ATOMIC
ngx_feature_run=yes
+ ngx_feature_run_force_result="$ngx_force_gcc_have_atomic"
ngx_feature_incs=
ngx_feature_path=
ngx_feature_libs=
@@ -179,6 +180,7 @@
ngx_feature="C99 variadic macros"
ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS"
ngx_feature_run=yes
+ ngx_feature_run_force_result="$ngx_force_c99_have_variadic_macros"
ngx_feature_incs="#include <stdio.h>
#define var(dummy, ...) sprintf(__VA_ARGS__)"
ngx_feature_path=
@@ -193,6 +195,7 @@
ngx_feature="gcc variadic macros"
ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS"
ngx_feature_run=yes
+ ngx_feature_run_force_result="$ngx_force_gcc_have_variadic_macros"
ngx_feature_incs="#include <stdio.h>
#define var(dummy, args...) sprintf(args)"
ngx_feature_path=
diff -r 0abfd4903c4b -r a0389d32d970 auto/cc/name
--- a/auto/cc/name Sat Aug 02 00:30:54 2014 +0200
+++ b/auto/cc/name Sat Aug 02 00:30:54 2014 +0200
@@ -8,6 +8,7 @@
ngx_feature="C compiler"
ngx_feature_name=
ngx_feature_run=yes
+ ngx_feature_run_force_result="$ngx_force_c_compiler"
ngx_feature_incs=
ngx_feature_path=
ngx_feature_libs=
diff -r 0abfd4903c4b -r a0389d32d970 auto/lib/libatomic/conf
--- a/auto/lib/libatomic/conf Sat Aug 02 00:30:54 2014 +0200
+++ b/auto/lib/libatomic/conf Sat Aug 02 00:30:54 2014 +0200
@@ -15,6 +15,7 @@
ngx_feature="atomic_ops library"
ngx_feature_name=NGX_HAVE_LIBATOMIC
ngx_feature_run=yes
+ ngx_feature_run_force_result="$ngx_force_have_libatomic"
ngx_feature_incs="#define AO_REQUIRE_CAS
#include <atomic_ops.h>"
ngx_feature_path=
diff -r 0abfd4903c4b -r a0389d32d970 auto/os/darwin
--- a/auto/os/darwin Sat Aug 02 00:30:54 2014 +0200
+++ b/auto/os/darwin Sat Aug 02 00:30:54 2014 +0200
@@ -27,6 +27,7 @@
ngx_feature="kqueue's EVFILT_TIMER"
ngx_feature_name="NGX_HAVE_TIMER_EVENT"
ngx_feature_run=yes
+ngx_feature_run_force_result="$ngx_force_have_timer_event"
ngx_feature_incs="#include <sys/event.h>
#include <sys/time.h>"
ngx_feature_path=
@@ -57,6 +58,7 @@
ngx_feature="Darwin 64-bit kqueue millisecond timeout bug"
ngx_feature_name=NGX_DARWIN_KEVENT_BUG
ngx_feature_run=bug
+ngx_feature_run_force_result="$ngx_force_kevent_bug"
ngx_feature_incs="#include <sys/event.h>
#include <sys/time.h>"
ngx_feature_path=
@@ -87,6 +89,7 @@
ngx_feature="sendfile()"
ngx_feature_name="NGX_HAVE_SENDFILE"
ngx_feature_run=yes
+ngx_feature_run_force_result="$ngx_force_have_sendfile"
ngx_feature_incs="#include <sys/types.h>
#include <sys/socket.h>
#include <sys/uio.h>
diff -r 0abfd4903c4b -r a0389d32d970 auto/os/linux
--- a/auto/os/linux Sat Aug 02 00:30:54 2014 +0200
+++ b/auto/os/linux Sat Aug 02 00:30:54 2014 +0200
@@ -49,6 +49,7 @@
ngx_feature="epoll"
ngx_feature_name="NGX_HAVE_EPOLL"
ngx_feature_run=yes
+ngx_feature_run_force_result="$ngx_force_have_epoll"
ngx_feature_incs="#include <sys/epoll.h>"
ngx_feature_path=
ngx_feature_libs=
@@ -106,6 +107,7 @@
ngx_feature="sendfile()"
ngx_feature_name="NGX_HAVE_SENDFILE"
ngx_feature_run=yes
+ngx_feature_run_force_result="$ngx_force_have_sendfile"
ngx_feature_incs="#include <sys/sendfile.h>
#include <errno.h>"
ngx_feature_path=
@@ -127,6 +129,7 @@
ngx_feature="sendfile64()"
ngx_feature_name="NGX_HAVE_SENDFILE64"
ngx_feature_run=yes
+ngx_feature_run_force_result="$ngx_force_have_sendfile64"
ngx_feature_incs="#include <sys/sendfile.h>
#include <errno.h>"
ngx_feature_path=
@@ -145,6 +148,7 @@
ngx_feature="prctl(PR_SET_DUMPABLE)"
ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
ngx_feature_run=yes
+ngx_feature_run_force_result="$ngx_force_have_pr_set_dumpable"
ngx_feature_incs="#include <sys/prctl.h>"
ngx_feature_path=
ngx_feature_libs=
diff -r 0abfd4903c4b -r a0389d32d970 auto/unix
--- a/auto/unix Sat Aug 02 00:30:54 2014 +0200
+++ b/auto/unix Sat Aug 02 00:30:54 2014 +0200
@@ -99,6 +99,7 @@
ngx_feature="kqueue's EVFILT_TIMER"
ngx_feature_name="NGX_HAVE_TIMER_EVENT"
ngx_feature_run=yes
+ ngx_feature_run_force_result="$ngx_force_have_timer_event"
ngx_feature_incs="#include <sys/event.h>
#include <sys/time.h>"
ngx_feature_path=
@@ -565,6 +566,7 @@
ngx_feature="sys_nerr"
ngx_feature_name="NGX_SYS_NERR"
ngx_feature_run=value
+ngx_feature_run_force_result="$ngx_force_sys_nerr"
ngx_feature_incs='#include <errno.h>
#include <stdio.h>'
ngx_feature_path=
@@ -579,6 +581,7 @@
ngx_feature="_sys_nerr"
ngx_feature_name="NGX_SYS_NERR"
ngx_feature_run=value
+ ngx_feature_run_force_result="$ngx_force_sys_nerr"
ngx_feature_incs='#include <errno.h>
#include <stdio.h>'
ngx_feature_path=
@@ -594,6 +597,7 @@
ngx_feature='maximum errno'
ngx_feature_name=NGX_SYS_NERR
ngx_feature_run=value
+ ngx_feature_run_force_result="$ngx_force_sys_nerr"
ngx_feature_incs='#include <errno.h>
#include <string.h>
#include <stdio.h>'
@@ -652,6 +656,7 @@
ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
ngx_feature_name="NGX_HAVE_MAP_ANON"
ngx_feature_run=yes
+ngx_feature_run_force_result="$ngx_force_have_map_anon"
ngx_feature_incs="#include <sys/mman.h>"
ngx_feature_path=
ngx_feature_libs=
@@ -665,6 +670,7 @@
ngx_feature='mmap("/dev/zero", MAP_SHARED)'
ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
ngx_feature_run=yes
+ngx_feature_run_force_result="$ngx_force_have_map_devzero"
ngx_feature_incs="#include <sys/mman.h>
#include <sys/stat.h>
#include <fcntl.h>"
@@ -680,6 +686,7 @@
ngx_feature="System V shared memory"
ngx_feature_name="NGX_HAVE_SYSVSHM"
ngx_feature_run=yes
+ngx_feature_run_force_result="$ngx_force_have_sysvshm"
ngx_feature_incs="#include <sys/ipc.h>
#include <sys/shm.h>"
ngx_feature_path=
@@ -694,6 +701,7 @@
ngx_feature="POSIX semaphores"
ngx_feature_name="NGX_HAVE_POSIX_SEM"
ngx_feature_run=yes
+ngx_feature_run_force_result="$ngx_force_have_posix_sem"
ngx_feature_incs="#include <semaphore.h>"
ngx_feature_path=
ngx_feature_libs=

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel