diff options
Diffstat (limited to 'auto/lib')
| -rw-r--r-- | auto/lib/md5/conf | 19 | ||||
| -rw-r--r-- | auto/lib/openssl/conf | 1 | ||||
| -rw-r--r-- | auto/lib/pcre/conf | 77 | ||||
| -rw-r--r-- | auto/lib/perl/conf | 6 | ||||
| -rw-r--r-- | auto/lib/sha1/conf | 18 | ||||
| -rw-r--r-- | auto/lib/zlib/conf | 1 |
6 files changed, 98 insertions, 24 deletions
diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf index 799d0756f..0c80fd59c 100644 --- a/auto/lib/md5/conf +++ b/auto/lib/md5/conf @@ -53,6 +53,7 @@ else ngx_feature_name= ngx_feature_run=no ngx_feature_incs="#include <md5.h>" + ngx_feature_path= ngx_feature_libs="-lmd5" ngx_feature_test="MD5_CTX md5; MD5Init(&md5)" . auto/feature @@ -70,6 +71,7 @@ else ngx_feature_name= ngx_feature_run=no ngx_feature_incs="#include <md5.h>" + ngx_feature_path= ngx_feature_libs="-lmd" ngx_feature_test="MD5_CTX md5; MD5Init(&md5)" . auto/feature @@ -85,15 +87,16 @@ else else if [ $MD5 = NO ]; then - # OpenSSL crypto library + # OpenSSL crypto library - ngx_feature="OpenSSL md5 crypto library" - ngx_feature_name="NGX_OPENSSL_MD5" - ngx_feature_run=no - ngx_feature_incs="#include <openssl/md5.h>" - ngx_feature_libs="-lcrypto" - ngx_feature_test="MD5_CTX md5; MD5_Init(&md5)" - . auto/feature + ngx_feature="OpenSSL md5 crypto library" + ngx_feature_name="NGX_OPENSSL_MD5" + ngx_feature_run=no + ngx_feature_incs="#include <openssl/md5.h>" + ngx_feature_path= + ngx_feature_libs="-lcrypto" + ngx_feature_test="MD5_CTX md5; MD5_Init(&md5)" + . auto/feature fi fi diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index 32f82ca7c..02e9e610b 100644 --- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -47,6 +47,7 @@ else ngx_feature_name="NGX_OPENSSL" ngx_feature_run=no ngx_feature_incs="#include <openssl/ssl.h>" + ngx_feature_path= ngx_feature_libs="-lssl -lcrypto" ngx_feature_test="SSL_library_init()" . auto/feature diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf index 460325c08..045e6c855 100644 --- a/auto/lib/pcre/conf +++ b/auto/lib/pcre/conf @@ -64,13 +64,11 @@ else if [ "$NGX_PLATFORM" != win32 ]; then PCRE=NO - # FreeBSD PCRE port requires --with-cc-opt="-I /usr/local/include" - # --with-ld-opt="-L /usr/local/lib" - ngx_feature="PCRE library" ngx_feature_name="NGX_PCRE" ngx_feature_run=no ngx_feature_incs="#include <pcre.h>" + ngx_feature_path= ngx_feature_libs="-lpcre" ngx_feature_test="pcre *re; re = pcre_compile(NULL, 0, NULL, 0, NULL)" . auto/feature @@ -81,6 +79,79 @@ else CORE_LIBS="$CORE_LIBS $ngx_feature_libs" PCRE=YES ngx_found=no + + else + # FreeBSD port + + ngx_feature="PCRE library in /usr/local/" + ngx_feature_name="NGX_PCRE" + ngx_feature_run=no + ngx_feature_incs="#include <pcre.h>" + ngx_feature_path="/usr/local/include" + ngx_feature_libs="-L /usr/local/lib -lpcre" + ngx_feature_test="pcre *re; + re = pcre_compile(NULL, 0, NULL, 0, NULL)" + . auto/feature fi + + if [ $ngx_found = yes ]; then + CORE_DEPS="$CORE_DEPS $REGEX_DEPS" + CORE_SRCS="$CORE_SRCS $REGEX_SRCS" + CORE_INCS="$CORE_INCS $ngx_feature_path" + CORE_LIBS="$CORE_LIBS $ngx_feature_libs" + PCRE=YES + ngx_found=no + + else + # Linux package + + if [ $PCRE = NO ]; then + + ngx_feature="PCRE library in /usr/include/pcre/" + ngx_feature_name="NGX_PCRE" + ngx_feature_run=no + ngx_feature_incs="#include <pcre.h>" + ngx_feature_path="/usr/include/pcre" + ngx_feature_libs="-lpcre" + ngx_feature_test="pcre *re; + re = pcre_compile(NULL, 0, NULL, 0, NULL)" + . auto/feature + fi + fi + + if [ $ngx_found = yes ]; then + CORE_DEPS="$CORE_DEPS $REGEX_DEPS" + CORE_SRCS="$CORE_SRCS $REGEX_SRCS" + CORE_INCS="$CORE_INCS $ngx_feature_path" + CORE_LIBS="$CORE_LIBS $ngx_feature_libs" + PCRE=YES + ngx_found=no + + else + # NetBSD port + + if [ $PCRE = NO ]; then + + ngx_feature="PCRE library in /usr/pkg/" + ngx_feature_name="NGX_PCRE" + ngx_feature_run=no + ngx_feature_incs="#include <pcre.h>" + ngx_feature_path="/usr/pkg/include" + ngx_feature_libs="-L /usr/pkg/lib -lpcre" + ngx_feature_test="pcre *re; + re = pcre_compile(NULL, 0, NULL, 0, NULL)" + . auto/feature + fi + fi + + if [ $ngx_found = yes ]; then + CORE_DEPS="$CORE_DEPS $REGEX_DEPS" + CORE_SRCS="$CORE_SRCS $REGEX_SRCS" + CORE_INCS="$CORE_INCS $ngx_feature_path" + CORE_LIBS="$CORE_LIBS $ngx_feature_libs" + PCRE=YES + ngx_found=no + fi + fi fi diff --git a/auto/lib/perl/conf b/auto/lib/perl/conf index e01f9b6c3..2ecaf3a49 100644 --- a/auto/lib/perl/conf +++ b/auto/lib/perl/conf @@ -36,11 +36,7 @@ if test -n "$NGX_PERL_VER"; then echo " + perl interpreter multiplicity found" fi - if $NGX_PERL -V:useithreads | grep define > /dev/null; then - have=NGX_HAVE_PERL_CLONE . auto/have - echo " + perl_clone() found" - - else + if $NGX_PERL -V:useithreads | grep undef > /dev/null; then # FreeBSD port wants to link with -pthread non-threaded perl ngx_perl_ldopts=`echo $ngx_perl_ldopts | sed 's/ -pthread//'` fi diff --git a/auto/lib/sha1/conf b/auto/lib/sha1/conf index a1e20c9b2..52ca97f59 100644 --- a/auto/lib/sha1/conf +++ b/auto/lib/sha1/conf @@ -43,6 +43,7 @@ else ngx_feature_name= ngx_feature_run=no ngx_feature_incs="#include <sha.h>" + ngx_feature_path= ngx_feature_libs="-lmd" ngx_feature_test="SHA_CTX sha1; SHA1_Init(&sha1)" . auto/feature @@ -57,15 +58,16 @@ else else if [ $SHA1 = NO ]; then - # OpenSSL crypto library + # OpenSSL crypto library - ngx_feature="OpenSSL sha1 crypto library" - ngx_feature_name= - ngx_feature_run=no - ngx_feature_incs="#include <openssl/sha.h>" - ngx_feature_libs="-lcrypto" - ngx_feature_test="SHA_CTX sha1; SHA1_Init(&sha1)" - . auto/feature + ngx_feature="OpenSSL sha1 crypto library" + ngx_feature_name= + ngx_feature_run=no + ngx_feature_incs="#include <openssl/sha.h>" + ngx_feature_path= + ngx_feature_libs="-lcrypto" + ngx_feature_test="SHA_CTX sha1; SHA1_Init(&sha1)" + . auto/feature fi fi diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf index 3123c669a..f033354a4 100644 --- a/auto/lib/zlib/conf +++ b/auto/lib/zlib/conf @@ -47,6 +47,7 @@ else ngx_feature_name= ngx_feature_run=no ngx_feature_incs="#include <zlib.h>" + ngx_feature_path= ngx_feature_libs="-lz" ngx_feature_test="z_stream z; deflate(&z, Z_NO_FLUSH)" . auto/feature |