Mercurial > hg > nginx
changeset 5038:1559423ec28b stable-1.2
Merge of r4946, r4978: perl.
*) Fixed build with embedded perl in certain setups (ticket #48).
*) Brought the link to ngx_http_perl_module documentation up to date.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sun, 10 Feb 2013 02:58:03 +0000 |
parents | 032f71d771e6 |
children | b5601d23b61e |
files | auto/lib/perl/make src/http/modules/perl/Makefile.PL src/http/modules/perl/nginx.pm |
diffstat | 3 files changed, 5 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/lib/perl/make Sun Feb 10 02:56:03 2013 +0000 +++ b/auto/lib/perl/make Sun Feb 10 02:58:03 2013 +0000 @@ -26,9 +26,7 @@ cd $NGX_OBJS/src/http/modules/perl \ && NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \ - NGX_PCRE=$PCRE \ - NGX_OBJS=$NGX_OBJS \ - NGX_OPENSSL=$OPENSSL \ + NGX_INCS="$CORE_INCS $NGX_OBJS $HTTP_INCS" \ $NGX_PERL Makefile.PL \ LIB=$NGX_PERL_MODULES \ INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN
--- a/src/http/modules/perl/Makefile.PL Sun Feb 10 02:56:03 2013 +0000 +++ b/src/http/modules/perl/Makefile.PL Sun Feb 10 02:58:03 2013 +0000 @@ -16,20 +16,9 @@ CCFLAGS => "$ENV{NGX_PM_CFLAGS}", OPTIMIZE => '-O', - INC => "-I ../../../../../src/core " . - "-I ../../../../../src/event " . - "-I ../../../../../src/os/unix " . - "-I ../../../../../src/http " . - "-I ../../../../../src/http/modules " . - "-I ../../../../../src/http/modules/perl " . - "-I ../../../../../$ENV{NGX_OBJS} " . - ($ENV{NGX_PCRE} =~ /^(YES|NO)/ ? "" : - ($ENV{NGX_PCRE} =~ m#^/# ? "-I $ENV{NGX_PCRE} " : - "-I ../../../../../$ENV{NGX_PCRE} ")) . - ($ENV{NGX_OPENSSL} =~ /^(YES|NO)/ ? "" : - ($ENV{NGX_OPENSSL} =~ m#^/# ? - "-I $ENV{NGX_OPENSSL}/.openssl/include " : - "-I ../../../../../$ENV{NGX_OPENSSL}/.openssl/include ")), + INC => join(" ", map { + m#^/# ? "-I $_" : "-I ../../../../../$_" + } (split /\s+/, $ENV{NGX_INCS})), depend => { 'nginx.c' =>
--- a/src/http/modules/perl/nginx.pm Sun Feb 10 02:56:03 2013 +0000 +++ b/src/http/modules/perl/nginx.pm Sun Feb 10 02:58:03 2013 +0000 @@ -123,7 +123,7 @@ =head1 SEE ALSO -http://sysoev.ru/nginx/docs/http/ngx_http_perl_module.html +http://nginx.org/en/docs/http/ngx_http_perl_module.html =head1 AUTHOR