diff options
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/isolation | 22 | ||||
| -rw-r--r-- | auto/sockets | 7 | ||||
| -rw-r--r-- | auto/sources | 3 | ||||
| -rw-r--r-- | auto/unix | 15 |
4 files changed, 21 insertions, 26 deletions
diff --git a/auto/isolation b/auto/isolation index fd35f8ed..384f7ef1 100644 --- a/auto/isolation +++ b/auto/isolation @@ -21,7 +21,7 @@ nxt_feature_test="#include <sys/wait.h> #include <sys/syscall.h> int main() { - return __NR_clone | SIGCHLD; + return SYS_clone | SIGCHLD; }" . auto/feature @@ -61,14 +61,30 @@ fi nxt_feature="Linux pivot_root()" -nxt_feature_name=NXT_HAVE_PIVOT_ROOT +nxt_feature_name=NXT_HAVE_LINUX_PIVOT_ROOT nxt_feature_run=no nxt_feature_incs= nxt_feature_libs= nxt_feature_test="#include <sys/syscall.h> + #if !defined(__linux__) + # error + #endif int main() { - return __NR_pivot_root; + return SYS_pivot_root; + }" +. auto/feature + + +nxt_feature="<mntent.h>" +nxt_feature_name=NXT_HAVE_MNTENT_H +nxt_feature_run=no +nxt_feature_incs= +nxt_feature_libs= +nxt_feature_test="#include <mntent.h> + + int main(void) { + return 0; }" . auto/feature diff --git a/auto/sockets b/auto/sockets index e6ef326d..e344a3db 100644 --- a/auto/sockets +++ b/auto/sockets @@ -225,12 +225,6 @@ nxt_feature_test="#include <sys/filio.h> }" . auto/feature -if [ $nxt_found = yes ]; then - NXT_SYS_FILIO_H="#include <sys/filio.h>" -else - NXT_SYS_FILIO_H= -fi - nxt_feature="ioctl(FIONBIO)" nxt_feature_name=NXT_HAVE_FIONBIO @@ -239,7 +233,6 @@ nxt_feature_incs= nxt_feature_libs= nxt_feature_test="#include <unistd.h> #include <sys/socket.h> - $NXT_SYS_FILIO_H #include <sys/ioctl.h> int main() { diff --git a/auto/sources b/auto/sources index 27a45edc..8548f812 100644 --- a/auto/sources +++ b/auto/sources @@ -69,7 +69,6 @@ NXT_LIB_SRCS=" \ src/nxt_event_conn_job_sendfile.c \ src/nxt_conn_proxy.c \ src/nxt_job.c \ - src/nxt_job_resolve.c \ src/nxt_sockaddr.c \ src/nxt_listen_socket.c \ src/nxt_upstream.c \ @@ -84,7 +83,9 @@ NXT_LIB_SRCS=" \ src/nxt_signal_handlers.c \ src/nxt_controller.c \ src/nxt_router.c \ + src/nxt_router_access_log.c \ src/nxt_h1proto.c \ + src/nxt_status.c \ src/nxt_http_request.c \ src/nxt_http_response.c \ src/nxt_http_error.c \ @@ -178,21 +178,6 @@ if [ $nxt_found = no ]; then fi -nxt_feature="posix_spawn()" -nxt_feature_name=NXT_HAVE_POSIX_SPAWN -nxt_feature_run= -nxt_feature_incs= -nxt_feature_libs= -nxt_feature_test="#include <spawn.h> - #include <unistd.h> - - int main(int argc, char *argv[]) { - (void) posix_spawn(NULL, \"\", NULL, NULL, argv, NULL); - return 0; - }" -. auto/feature - - # NetBSD 1.0, OpenBSD 1.0, FreeBSD 2.2 setproctitle(). nxt_feature="setproctitle()" |