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 | |
| parent | be909c35b0b2ad737b701fde9c63105251800b14 (diff) | |
| download | nginx-01f59615400f7449a8b88e9e74a27c2a8b93fb87.tar.gz | |
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".
| -rw-r--r-- | auto/cc/name | 10 | ||||
| -rw-r--r-- | auto/lib/perl/make | 1 | ||||
| -rw-r--r-- | src/http/modules/perl/Makefile.PL | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/auto/cc/name b/auto/cc/name index 598f879a0..7860c69e2 100644 --- a/auto/cc/name +++ b/auto/cc/name @@ -64,16 +64,16 @@ if [ "$CC" = bcc32 ]; then echo " + using Borland C++ compiler" else -if `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then - NGX_CC_NAME=gcc - echo " + using GNU C compiler" - -else if `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then NGX_CC_NAME=icc echo " + using Intel C++ compiler" else +if `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then + NGX_CC_NAME=gcc + echo " + using GNU C compiler" + +else if `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then NGX_CC_NAME=sunc echo " + using Sun C compiler" diff --git a/auto/lib/perl/make b/auto/lib/perl/make index f5d9ab501..b4df01dd9 100644 --- a/auto/lib/perl/make +++ b/auto/lib/perl/make @@ -28,6 +28,7 @@ $NGX_OBJS/src/http/modules/perl/Makefile: \ && NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \ NGX_PCRE=$PCRE \ NGX_OBJS=$NGX_OBJS \ + NGX_OPENSSL=$OPENSSL \ $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 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' => |