Mercurial > hg > nginx
annotate auto/lib/perl/conf @ 4687:7f50a4063100
Mp4: fixed non-keyframe seeks in some cases (ticket #175).
Number of entries in stsc atom was wrong if we've added an entry to
split a chunk.
Additionally, there is no need to add an entry if we are going to split
last chunk in an entry, it's enough to update the entry we already have.
Previously new entry was added and old one was left as is, resulting in
incorrect entry with zero chunks which might confuse some software.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 18 Jun 2012 14:01:18 +0000 |
| parents | d620f497c50f |
| children | fac1cc762969 |
| rev | line source |
|---|---|
| 599 | 1 |
| 2 # Copyright (C) Igor Sysoev | |
| 4412 | 3 # Copyright (C) Nginx, Inc. |
| 599 | 4 |
| 5 | |
| 6 echo "checking for perl" | |
| 7 | |
| 8 | |
| 9 NGX_PERL_VER=`$NGX_PERL -v 2>&1 | grep '^This is perl' 2>&1 \ | |
| 10 | sed -e 's/^This is perl, \(.*\)/\1/'` | |
| 11 | |
| 12 if test -n "$NGX_PERL_VER"; then | |
| 13 echo " + perl version: $NGX_PERL_VER" | |
| 14 | |
| 15 if [ "`echo 'use 5.006001; print "OK"' | $NGX_PERL 2>&1`" != OK ]; then | |
| 16 echo | |
| 17 echo "$0: error: perl 5.6.1 or higher is required" | |
| 18 echo | |
| 19 | |
| 20 exit 1; | |
| 21 fi | |
| 22 | |
| 681 | 23 NGX_PERL_CFLAGS="$CFLAGS `$NGX_PERL -MExtUtils::Embed -e ccopts`" |
| 24 NGX_PM_CFLAGS=`$NGX_PERL -MExtUtils::Embed -e ccopts` | |
| 25 | |
| 26 # gcc 4.1/4.2 warn about unused values in pTHX_ | |
| 27 NGX_PERL_CFLAGS=`echo $NGX_PERL_CFLAGS \ | |
| 28 | sed -e 's/-Wunused-value/-Wno-unused-value/'` | |
| 29 # icc8 warns 'declaration hides parameter "my_perl"' in ENTER and LEAVE | |
| 30 NGX_PERL_CFLAGS=`echo $NGX_PERL_CFLAGS \ | |
| 31 | sed -e 's/-wd171/-wd171 -wd1599/'` | |
| 32 | |
| 599 | 33 ngx_perl_ldopts=`$NGX_PERL -MExtUtils::Embed -e ldopts` |
| 34 | |
| 35 if $NGX_PERL -V:usemultiplicity | grep define > /dev/null; then | |
| 36 have=NGX_HAVE_PERL_MULTIPLICITY . auto/have | |
| 37 echo " + perl interpreter multiplicity found" | |
| 38 fi | |
| 39 | |
|
872
1c4a5b3f9110
Axe several perl interpreter instances: they may be useful in currently
Igor Sysoev <igor@sysoev.ru>
parents:
681
diff
changeset
|
40 if $NGX_PERL -V:useithreads | grep undef > /dev/null; then |
| 599 | 41 # FreeBSD port wants to link with -pthread non-threaded perl |
| 42 ngx_perl_ldopts=`echo $ngx_perl_ldopts | sed 's/ -pthread//'` | |
| 43 fi | |
| 44 | |
| 45 CORE_LINK="$CORE_LINK $ngx_perl_ldopts" | |
| 46 LINK_DEPS="$LINK_DEPS $NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.so" | |
| 47 | |
| 48 if test -n "$NGX_PERL_MODULES"; then | |
| 49 have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\"" | |
| 50 . auto/define | |
|
950
9581fba9ea12
fix for nginx.pm default installation
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
51 NGX_PERL_MODULES_MAN=$NGX_PERL_MODULES/man3 |
| 599 | 52 fi |
| 53 | |
| 54 else | |
| 55 echo | |
| 56 echo "$0: error: perl 5.6.1 or higher is required" | |
| 57 echo | |
| 58 | |
| 59 exit 1; | |
| 60 fi |