aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-06-03 04:53:01 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-06-03 04:53:01 +0000
commit9af0c95f64d384b97c7ae9fd43f0ff0acf57831c (patch)
tree6460bc9c4b74a9c642eb57f5f9dec01077863ff3
parent05ff657234c66fbcb4a54adeb1fed9bd73540d83 (diff)
downloadnginx-9af0c95f64d384b97c7ae9fd43f0ff0acf57831c.tar.gz
nginx-9af0c95f64d384b97c7ae9fd43f0ff0acf57831c.zip
librt must be tested before creating Makefile
the bug has been introduced in r2817
-rw-r--r--auto/os/features22
-rwxr-xr-xauto/unix22
2 files changed, 22 insertions, 22 deletions
diff --git a/auto/os/features b/auto/os/features
index ae0590e09..140e26b89 100644
--- a/auto/os/features
+++ b/auto/os/features
@@ -252,3 +252,25 @@ if [ $ngx_found != yes ]; then
NGX_LIBDL="-ldl"
fi
fi
+
+
+ngx_feature="sched_yield()"
+ngx_feature_name="NGX_HAVE_SCHED_YIELD"
+ngx_feature_run=no
+ngx_feature_incs="#include <sched.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="sched_yield()"
+. auto/feature
+
+
+if [ $ngx_found != yes ]; then
+
+ ngx_feature="sched_yield() in librt"
+ ngx_feature_libs="-lrt"
+ . auto/feature
+
+ if [ $ngx_found = yes ]; then
+ CORE_LIBS="$CORE_LIBS -lrt"
+ fi
+fi
diff --git a/auto/unix b/auto/unix
index 399e54c2a..687a23a88 100755
--- a/auto/unix
+++ b/auto/unix
@@ -163,28 +163,6 @@ ngx_feature_test="void *p; p = memalign(4096, 4096)"
. auto/feature
-ngx_feature="sched_yield()"
-ngx_feature_name="NGX_HAVE_SCHED_YIELD"
-ngx_feature_run=no
-ngx_feature_incs="#include <sched.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="sched_yield()"
-. auto/feature
-
-
-if [ $ngx_found != yes ]; then
-
- ngx_feature="sched_yield() in librt"
- ngx_feature_libs="-lrt"
- . auto/feature
-
- if [ $ngx_found = yes ]; then
- CORE_LIBS="$CORE_LIBS -lrt"
- fi
-fi
-
-
ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
ngx_feature_name="NGX_HAVE_MAP_ANON"
ngx_feature_run=yes