diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2016-02-26 14:27:04 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2016-02-26 14:27:04 +0300 |
| commit | 89b8f57768c661a6ccaa06a53c3137510d8b0de2 (patch) | |
| tree | 4c95d4c141ddbbc835b890f2d03a5de4cd3e75f5 /auto/lib | |
| parent | 39b78fdf964df34523f7dc8bc32f09d333db1849 (diff) | |
| download | nginx-89b8f57768c661a6ccaa06a53c3137510d8b0de2.tar.gz nginx-89b8f57768c661a6ccaa06a53c3137510d8b0de2.tar.bz2 | |
Dynamic modules: perl.
Diffstat (limited to 'auto/lib')
| -rw-r--r-- | auto/lib/conf | 2 | ||||
| -rw-r--r-- | auto/lib/make | 2 | ||||
| -rw-r--r-- | auto/lib/perl/conf | 7 | ||||
| -rw-r--r-- | auto/lib/perl/make | 5 |
4 files changed, 11 insertions, 5 deletions
diff --git a/auto/lib/conf b/auto/lib/conf index 6aaa43a5f..a6242e781 100644 --- a/auto/lib/conf +++ b/auto/lib/conf @@ -66,7 +66,7 @@ if [ $USE_LIBGD != NO ]; then . auto/lib/libgd/conf fi -if [ $USE_PERL = YES ]; then +if [ $USE_PERL != NO ]; then . auto/lib/perl/conf fi diff --git a/auto/lib/make b/auto/lib/make index 58a84a34c..6298b940f 100644 --- a/auto/lib/make +++ b/auto/lib/make @@ -27,6 +27,6 @@ if [ $NGX_LIBATOMIC != NO -a $NGX_LIBATOMIC != YES ]; then . auto/lib/libatomic/make fi -if [ $USE_PERL = YES ]; then +if [ $USE_PERL != NO ]; then . auto/lib/perl/make fi diff --git a/auto/lib/perl/conf b/auto/lib/perl/conf index 4d1bcf128..f5f5d3e57 100644 --- a/auto/lib/perl/conf +++ b/auto/lib/perl/conf @@ -60,8 +60,11 @@ if test -n "$NGX_PERL_VER"; then | sed -e 's/-arch i386//' -e 's/-arch x86_64//'` fi - CORE_LINK="$CORE_LINK $ngx_perl_ldopts" - LINK_DEPS="$LINK_DEPS $NGX_OBJS/$ngx_perl_module" + if [ $USE_PERL = YES ]; then + CORE_LINK="$CORE_LINK $ngx_perl_ldopts" + fi + + NGX_LIB_PERL="$ngx_perl_ldopts" if test -n "$NGX_PERL_MODULES"; then have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\"" diff --git a/auto/lib/perl/make b/auto/lib/perl/make index d1c1b9e48..8af8902f5 100644 --- a/auto/lib/perl/make +++ b/auto/lib/perl/make @@ -8,7 +8,10 @@ v=`grep 'define NGINX_VERSION' src/core/nginx.h | sed -e 's/^.*"\(.*\)".*/\1/'` cat << END >> $NGX_MAKEFILE -$NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.$ngx_perl_dlext: \\ +$NGX_OBJS/src/http/modules/perl/ngx_http_perl_module.o: \\ + $NGX_OBJS/$ngx_perl_module + +$NGX_OBJS/$ngx_perl_module: \\ \$(CORE_DEPS) \$(HTTP_DEPS) \\ src/http/modules/perl/ngx_http_perl_module.h \\ $NGX_OBJS/src/http/modules/perl/Makefile |