Fijxu
/
nginx-quic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Maxim Dounin 2013-02-10 02:58:03 +00:00
parent 1c191e08c3
commit 3fb9abaf6e
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auto/lib/perl/make
View File

@ -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

17
src/http/modules/perl/Makefile.PL
View File

@ -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' =>

2
src/http/modules/perl/nginx.pm
View File

@ -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