Skip to content

Commit 1ac97c7

Browse files
committed
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...)
2 parents 69d31f1 + bbfea4b commit 1ac97c7

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

ext/pcre/config0.m4

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,15 @@ PHP_ARG_WITH(pcre-jit,,[ --with-pcre-jit Enable PCRE JIT functionality
4747
fi
4848
fi
4949

50-
PHP_CHECK_LIBRARY(pcre2-8, pcre2_jit_compile_8,
51-
[
52-
AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, [ ])
53-
],[
54-
],[
55-
$PCRE2_LIB
56-
])
50+
if test "$PHP_PCRE_JIT" != "no"; then
51+
PHP_CHECK_LIBRARY(pcre2-8, pcre2_jit_compile_8,
52+
[
53+
AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, [ ])
54+
],[
55+
],[
56+
$PCRE2_LIB
57+
])
58+
fi
5759

5860
PHP_EVAL_INCLINE($PCRE2_INC)
5961
PHP_EVAL_LIBLINE($PCRE2_LIB)

0 commit comments

Comments
 (0)