From 57d9d632be9a9f7e3ac00f9eb10b069afd0b1543 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Thu, 29 May 2014 18:52:10 +0200 Subject: [PATCH] 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 Refresh for 1.8.0. Signed-off-by: Danomi Manchego [rebased against v1.20.1] Signed-off-by: Adam Duskett --- auto/cc/conf | 3 +++ auto/cc/name | 1 + auto/lib/libatomic/conf | 1 + auto/os/darwin | 3 +++ auto/os/linux | 4 ++++ auto/unix | 7 +++++++ 6 files changed, 19 insertions(+) diff --git a/auto/cc/conf b/auto/cc/conf index afbca62b..ad42c800 100644 --- a/auto/cc/conf +++ b/auto/cc/conf @@ -184,6 +184,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then 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= @@ -205,6 +206,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then 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 #define var(dummy, ...) sprintf(__VA_ARGS__)" ngx_feature_path= @@ -219,6 +221,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then 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 #define var(dummy, args...) sprintf(args)" ngx_feature_path= diff --git a/auto/cc/name b/auto/cc/name index ded93f5b..7c3cb74a 100644 --- a/auto/cc/name +++ b/auto/cc/name @@ -8,6 +8,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then 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 --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf index d1e484ab..37249161 100644 --- a/auto/lib/libatomic/conf +++ b/auto/lib/libatomic/conf @@ -15,6 +15,7 @@ else 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 " ngx_feature_path= diff --git a/auto/os/darwin b/auto/os/darwin index 429468f7..1ed47cca 100644 --- a/auto/os/darwin +++ b/auto/os/darwin @@ -33,6 +33,7 @@ NGX_KQUEUE_CHECKED=YES 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 #include " ngx_feature_path= @@ -63,6 +64,7 @@ ngx_feature_test="int kq; 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 #include " ngx_feature_path= @@ -92,6 +94,7 @@ ngx_feature_test="int kq; 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 #include #include diff --git a/auto/os/linux b/auto/os/linux index 2c8a9bb8..eb4513ee 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -37,6 +37,7 @@ fi 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 " ngx_feature_path= ngx_feature_libs= @@ -136,6 +137,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE" 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 #include " ngx_feature_path= @@ -157,6 +159,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" 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 #include " ngx_feature_path= @@ -175,6 +178,7 @@ ngx_include="sys/prctl.h"; . auto/include 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 " ngx_feature_path= ngx_feature_libs= diff --git a/auto/unix b/auto/unix index 43d3b25a..3da00537 100644 --- a/auto/unix +++ b/auto/unix @@ -100,6 +100,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then 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 #include " ngx_feature_path= @@ -722,6 +723,7 @@ if [ $ngx_found = no ]; then 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 #include ' ngx_feature_path= @@ -737,6 +739,7 @@ if [ $ngx_found = no ]; then 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 #include ' ngx_feature_path= @@ -806,6 +809,7 @@ ngx_feature_test="void *p; p = memalign(4096, 4096); 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 " ngx_feature_path= ngx_feature_libs= @@ -819,6 +823,7 @@ ngx_feature_test="void *p; 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 #include #include " @@ -834,6 +839,7 @@ ngx_feature_test='void *p; int fd; 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 #include " ngx_feature_path= @@ -848,6 +854,7 @@ ngx_feature_test="int id; 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 " ngx_feature_path= ngx_feature_libs= -- 2.17.1