Klaus Demo nginx / 01f5961
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". Maxim Dounin 7 years ago
3 changed file(s) with 11 addition(s) and 6 deletion(s). Raw diff Collapse all Expand all
6363 echo " + using Borland C++ compiler"
6464
6565 else
66 if `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then
67 NGX_CC_NAME=icc
68 echo " + using Intel C++ compiler"
69
70 else
6671 if `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then
6772 NGX_CC_NAME=gcc
6873 echo " + using GNU C compiler"
69
70 else
71 if `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then
72 NGX_CC_NAME=icc
73 echo " + using Intel C++ compiler"
7474
7575 else
7676 if `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then
2727 && NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \
2828 NGX_PCRE=$PCRE \
2929 NGX_OBJS=$NGX_OBJS \
30 NGX_OPENSSL=$OPENSSL \
3031 $NGX_PERL Makefile.PL \
3132 LIB=$NGX_PERL_MODULES \
3233 INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN
2424 "-I ../../../../../$ENV{NGX_OBJS} " .
2525 ($ENV{NGX_PCRE} =~ /^(YES|NO)/ ? "" :
2626 ($ENV{NGX_PCRE} =~ m#^/# ? "-I $ENV{NGX_PCRE} " :
27 "-I ../../../../../$ENV{NGX_PCRE} ")),
27 "-I ../../../../../$ENV{NGX_PCRE} ")) .
28 ($ENV{NGX_OPENSSL} =~ /^(YES|NO)/ ? "" :
29 ($ENV{NGX_OPENSSL} =~ m#^/# ?
30 "-I $ENV{NGX_OPENSSL}/.openssl/include " :
31 "-I ../../../../../$ENV{NGX_OPENSSL}/.openssl/include ")),
2832
2933 depend => {
3034 'nginx.c' =>