Skip to content

Commit 882dcb4

Browse files
committed
Fix bogus $PHP_PCRE_REGEX checks
This variable was dropped in the pkg-config migration, which resulted in spurious warnings about using valgrind with external PCRE. Fix the checks to use the right variable.
1 parent d91e3be commit 882dcb4

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

ext/pcre/config0.m4

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,18 @@ else
6868
AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
6969
AC_DEFINE(PCRE2_CODE_UNIT_WIDTH, 8, [ ])
7070

71-
if test "$PHP_PCRE_REGEX" != "no"; then
72-
AC_MSG_CHECKING([whether to enable PCRE JIT functionality])
73-
if test "$PHP_PCRE_JIT" != "no"; then
74-
AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, [ ])
75-
AC_MSG_RESULT([yes])
76-
else
71+
AC_MSG_CHECKING([whether to enable PCRE JIT functionality])
72+
if test "$PHP_PCRE_JIT" != "no"; then
73+
AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, [ ])
74+
AC_MSG_RESULT([yes])
75+
else
7776
AC_MSG_RESULT([no])
78-
fi
7977
fi
8078
fi
8179

8280
PHP_ARG_WITH(pcre-valgrind,,[ --with-pcre-valgrind=DIR
8381
Enable PCRE valgrind support. Developers only!], no, no)
84-
if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
82+
if test "$PHP_EXTERNAL_PCRE" != "no"; then
8583
AC_MSG_WARN([PHP is going to be linked with an external PCRE, --with-pcre-valgrind has no effect])
8684
else
8785
if test "$PHP_PCRE_VALGRIND" != "no"; then

0 commit comments

Comments
 (0)