diff options
| author | Remi Collet <remi@php.net> | 2018-10-04 11:46:37 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2018-10-04 11:46:37 +0200 |
| commit | 1ac97c77cb0c0521496881da0f82f0330a552593 (patch) | |
| tree | 9cae44ff425903a3cdf6fc4aa4831fd15f3053c2 | |
| parent | 69d31f167ce2fffefbf3079760df5364452b770b (diff) | |
| parent | bbfea4b470f30b3d92ad73e4addf37c3e247052a (diff) | |
| download | php-git-1ac97c77cb0c0521496881da0f82f0330a552593.tar.gz | |
Merge branch 'PHP-7.3'
* PHP-7.3:
Allow to disable pcre.jit when system library is used as it is for now broken on some arch (s390x...)
| -rw-r--r-- | ext/pcre/config0.m4 | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index dd1b7d55aa..3f7f04d4fc 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -47,13 +47,15 @@ PHP_ARG_WITH(pcre-jit,,[ --with-pcre-jit Enable PCRE JIT functionality fi fi - PHP_CHECK_LIBRARY(pcre2-8, pcre2_jit_compile_8, - [ - AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, [ ]) - ],[ - ],[ - $PCRE2_LIB - ]) + if test "$PHP_PCRE_JIT" != "no"; then + PHP_CHECK_LIBRARY(pcre2-8, pcre2_jit_compile_8, + [ + AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, [ ]) + ],[ + ],[ + $PCRE2_LIB + ]) + fi PHP_EVAL_INCLINE($PCRE2_INC) PHP_EVAL_LIBLINE($PCRE2_LIB) |