Mercurial > hg > nginx
comparison src/http/modules/perl/Makefile.PL @ 4512:cbed47593ce0 stable-1.0
Merge of r4474, r4493: configure/build fixes.
*) Fixed build with embedded perl and --with-openssl.
*) Configure: moved icc detection before gcc. New versions of icc
confuse auto/cc/name due to introduced handling of a "icc -v".
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 05 Mar 2012 12:58:10 +0000 |
parents | 4919fb357a5d |
children | ae3ebf5ac8cd |
comparison
equal
deleted
inserted
replaced
4511:83c26de984ef | 4512:cbed47593ce0 |
---|---|
23 "-I ../../../../../src/http/modules " . | 23 "-I ../../../../../src/http/modules " . |
24 "-I ../../../../../src/http/modules/perl " . | 24 "-I ../../../../../src/http/modules/perl " . |
25 "-I ../../../../../$ENV{NGX_OBJS} " . | 25 "-I ../../../../../$ENV{NGX_OBJS} " . |
26 ($ENV{NGX_PCRE} =~ /^(YES|NO)/ ? "" : | 26 ($ENV{NGX_PCRE} =~ /^(YES|NO)/ ? "" : |
27 ($ENV{NGX_PCRE} =~ m#^/# ? "-I $ENV{NGX_PCRE} " : | 27 ($ENV{NGX_PCRE} =~ m#^/# ? "-I $ENV{NGX_PCRE} " : |
28 "-I ../../../../../$ENV{NGX_PCRE} ")), | 28 "-I ../../../../../$ENV{NGX_PCRE} ")) . |
29 ($ENV{NGX_OPENSSL} =~ /^(YES|NO)/ ? "" : | |
30 ($ENV{NGX_OPENSSL} =~ m#^/# ? | |
31 "-I $ENV{NGX_OPENSSL}/.openssl/include " : | |
32 "-I ../../../../../$ENV{NGX_OPENSSL}/.openssl/include ")), | |
29 | 33 |
30 depend => { | 34 depend => { |
31 'nginx.c' => | 35 'nginx.c' => |
32 "../../../../../src/http/modules/perl/ngx_http_perl_module.h" | 36 "../../../../../src/http/modules/perl/ngx_http_perl_module.h" |
33 }, | 37 }, |