From c919d3178a8e680406c02c609bc8d8e18f32f566 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Thu, 2 Apr 2009 13:46:39 +0000 Subject: [PATCH] autoconfigure crypt_r(): uclibc has no crypt_r() --- auto/os/linux | 13 +++++++++++++ src/os/unix/ngx_linux_config.h | 5 ----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/auto/os/linux b/auto/os/linux index 43ff3c9e2..c19f3f49d 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -124,6 +124,19 @@ ngx_feature_test="long mask = 0; . auto/feature +# crypt_r() + +ngx_feature="crypt_r()" +ngx_feature_name="NGX_HAVE_GNU_CRYPT_R" +ngx_feature_run=no +ngx_feature_incs="#include " +ngx_feature_path= +ngx_feature_libs=-lcrypt +ngx_feature_test="struct crypt_data cd; + crypt_r(NULL, NULL, &cd);" +. auto/feature + + ngx_include="sys/vfs.h"; . auto/include diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h index abeda08af..fb978c46e 100644 --- a/src/os/unix/ngx_linux_config.h +++ b/src/os/unix/ngx_linux_config.h @@ -95,11 +95,6 @@ extern ssize_t sendfile(int s, int fd, int32_t *offset, size_t size); #endif -#ifndef NGX_HAVE_GNU_CRYPT_R -#define NGX_HAVE_GNU_CRYPT_R 1 -#endif - - #ifndef NGX_HAVE_INHERITED_NONBLOCK #define NGX_HAVE_INHERITED_NONBLOCK 0 #endif