diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-04-16 17:16:57 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-04-16 17:16:57 +0200 |
| commit | 23804f0c91d19f301a424c4b5b0f90ac764eedda (patch) | |
| tree | 0b5fbdd14ba5d24e4743c1da29f8d3dc50d73c80 | |
| parent | 55d7a8381c10c4980c82d302e823b29810ea540b (diff) | |
| parent | 12ee246ae45889004fc2c099c04cfff1ce6e8848 (diff) | |
| download | php-git-23804f0c91d19f301a424c4b5b0f90ac764eedda.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
ext/pcre/config0.m4: add ac_cv_have_pcre2_jit variable
| -rw-r--r-- | ext/pcre/config0.m4 | 58 |
1 files changed, 30 insertions, 28 deletions
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 2ae174b479..c15f785a4e 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -25,35 +25,37 @@ if test "$PHP_EXTERNAL_PCRE" != "no"; then AC_DEFINE(HAVE_PCRE, 1, [ ]) if test "$PHP_PCRE_JIT" != "no"; then - AC_MSG_CHECKING([for JIT support in PCRE2]) - AC_RUN_IFELSE([ - AC_LANG_SOURCE([[ - #include <pcre2.h> - #include <stdlib.h> - int main(void) { - uint32_t have_jit; - pcre2_config_8(PCRE2_CONFIG_JIT, &have_jit); - return !have_jit; - } - ]])], [ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, []) - ], - [ - AC_MSG_RESULT([no]) - ], - [ - AC_CANONICAL_HOST - case $host_cpu in - arm*|i[34567]86|x86_64|mips*|powerpc*|sparc) - AC_MSG_RESULT([yes]) + AC_CACHE_CHECK([for JIT support in PCRE2], ac_cv_have_pcre2_jit, [ + AC_RUN_IFELSE([ + AC_LANG_SOURCE([[ + #include <pcre2.h> + #include <stdlib.h> + int main(void) { + uint32_t have_jit; + pcre2_config_8(PCRE2_CONFIG_JIT, &have_jit); + return !have_jit; + } + ]])], [ + ac_cv_have_pcre2_jit=yes + ], + [ + ac_cv_have_pcre2_jit=no + ], + [ + AC_CANONICAL_HOST + case $host_cpu in + arm*|i[34567]86|x86_64|mips*|powerpc*|sparc) + ac_cv_have_pcre2_jit=yes + ;; + *) + ac_cv_have_pcre2_jit=no + ;; + esac + ]) + ]) + if test $ac_cv_have_pcre2_jit = yes; then AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, []) - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac - ]) + fi fi PHP_NEW_EXTENSION(pcre, php_pcre.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) |