Mercurial > hg > nginx

comparison auto/lib/perl/conf @ 5739:6e4bb1d6679d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configure: style.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 26 Jun 2014 03:34:02 +0400
parents baf2816d556d
children dde2ae4701e1
comparison
equal deleted inserted replaced
5738:c95d7882dfc9 5739:6e4bb1d6679d
39 | sed -e 's/-wd171/-wd171 -wd1599/'` 39 | sed -e 's/-wd171/-wd171 -wd1599/'`
40 40
41 ngx_perl_ldopts=`$NGX_PERL -MExtUtils::Embed -e ldopts` 41 ngx_perl_ldopts=`$NGX_PERL -MExtUtils::Embed -e ldopts`
42 42
43 ngx_perl_dlext=`$NGX_PERL -MConfig -e 'print $Config{dlext}'` 43 ngx_perl_dlext=`$NGX_PERL -MConfig -e 'print $Config{dlext}'`
44 ngx_perl_module="src/http/modules/perl/blib/arch/auto/nginx.$ngx_perl_dlext"
44 45
45 if $NGX_PERL -V:usemultiplicity | grep define > /dev/null; then 46 if $NGX_PERL -V:usemultiplicity | grep define > /dev/null; then
46 have=NGX_HAVE_PERL_MULTIPLICITY . auto/have 47 have=NGX_HAVE_PERL_MULTIPLICITY . auto/have
47 echo " + perl interpreter multiplicity found" 48 echo " + perl interpreter multiplicity found"
48 fi 49 fi
52 ngx_perl_ldopts=`echo $ngx_perl_ldopts | sed 's/ -pthread//'` 53 ngx_perl_ldopts=`echo $ngx_perl_ldopts | sed 's/ -pthread//'`
53 fi 54 fi
54 55
55 if [ "$NGX_SYSTEM" = "Darwin" ]; then 56 if [ "$NGX_SYSTEM" = "Darwin" ]; then
56 # OS X system perl wants to link universal binaries 57 # OS X system perl wants to link universal binaries
57 ngx_perl_ldopts=`echo $ngx_perl_ldopts | sed -e 's/-arch x86_64 -arch i386//'` 58 ngx_perl_ldopts=`echo $ngx_perl_ldopts \
59 | sed -e 's/-arch x86_64 -arch i386//'`
58 fi 60 fi
59 61
60 CORE_LINK="$CORE_LINK $ngx_perl_ldopts" 62 CORE_LINK="$CORE_LINK $ngx_perl_ldopts"
61 LINK_DEPS="$LINK_DEPS $NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.$ngx_perl_dlext" 63 LINK_DEPS="$LINK_DEPS $NGX_OBJS/$ngx_perl_module"
62 64
63 if test -n "$NGX_PERL_MODULES"; then 65 if test -n "$NGX_PERL_MODULES"; then
64 have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\"" 66 have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\""
65 . auto/define 67 . auto/define
66 NGX_PERL_MODULES_MAN=$NGX_PERL_MODULES/man3 68 NGX_PERL_MODULES_MAN=$NGX_PERL_MODULES/man3