diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-02-10 02:58:03 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-02-10 02:58:03 +0000 |
| commit | deee4cafa0274780ed03eb74e240a9157909769a (patch) | |
| tree | 6450f8771de6562cb22559e64fddecc15877ed43 | |
| parent | dcec6574b8b4ee118bdffbbbf6bf5a555853cb64 (diff) | |
| download | nginx-deee4cafa0274780ed03eb74e240a9157909769a.tar.gz nginx-deee4cafa0274780ed03eb74e240a9157909769a.tar.bz2 | |
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.
| -rw-r--r-- | auto/lib/perl/make | 4 | ||||
| -rw-r--r-- | src/http/modules/perl/Makefile.PL | 17 | ||||
| -rw-r--r-- | src/http/modules/perl/nginx.pm | 2 |
3 files changed, 5 insertions, 18 deletions
diff --git a/auto/lib/perl/make b/auto/lib/perl/make index 5f13bb29c..6fe95af0e 100644 --- a/auto/lib/perl/make +++ b/auto/lib/perl/make @@ -26,9 +26,7 @@ $NGX_OBJS/src/http/modules/perl/Makefile: \ 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 diff --git a/src/http/modules/perl/Makefile.PL b/src/http/modules/perl/Makefile.PL index cfb38c190..78a1e516b 100644 --- a/src/http/modules/perl/Makefile.PL +++ b/src/http/modules/perl/Makefile.PL @@ -16,20 +16,9 @@ WriteMakefile( 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' => diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm index a190abc37..5c7a4c3fc 100644 --- a/src/http/modules/perl/nginx.pm +++ b/src/http/modules/perl/nginx.pm @@ -123,7 +123,7 @@ This module provides a Perl interface to the nginx HTTP server API. =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 |