diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-03-05 12:58:10 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-03-05 12:58:10 +0000 |
| commit | 01f59615400f7449a8b88e9e74a27c2a8b93fb87 (patch) | |
| tree | 17257605a1c356697a4ed18335d20f0e62e228a8 /src | |
| parent | be909c35b0b2ad737b701fde9c63105251800b14 (diff) | |
| download | nginx-01f59615400f7449a8b88e9e74a27c2a8b93fb87.tar.gz nginx-01f59615400f7449a8b88e9e74a27c2a8b93fb87.tar.bz2 | |
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".
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/perl/Makefile.PL | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/http/modules/perl/Makefile.PL b/src/http/modules/perl/Makefile.PL index 6575f284c..cfb38c190 100644 --- a/src/http/modules/perl/Makefile.PL +++ b/src/http/modules/perl/Makefile.PL @@ -25,7 +25,11 @@ WriteMakefile( "-I ../../../../../$ENV{NGX_OBJS} " . ($ENV{NGX_PCRE} =~ /^(YES|NO)/ ? "" : ($ENV{NGX_PCRE} =~ m#^/# ? "-I $ENV{NGX_PCRE} " : - "-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 ")), depend => { 'nginx.c' => |