comparison auto/lib/perl/make @ 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 432428be692d
comparison
equal deleted inserted replaced
4511:83c26de984ef 4512:cbed47593ce0
26 26
27 cd $NGX_OBJS/src/http/modules/perl \ 27 cd $NGX_OBJS/src/http/modules/perl \
28 && NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \ 28 && NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \
29 NGX_PCRE=$PCRE \ 29 NGX_PCRE=$PCRE \
30 NGX_OBJS=$NGX_OBJS \ 30 NGX_OBJS=$NGX_OBJS \
31 NGX_OPENSSL=$OPENSSL \
31 $NGX_PERL Makefile.PL \ 32 $NGX_PERL Makefile.PL \
32 LIB=$NGX_PERL_MODULES \ 33 LIB=$NGX_PERL_MODULES \
33 INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN 34 INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN
34 35
35 END 36 END