diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-01 11:41:18 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-01 11:42:41 +0100 |
| commit | 882dcb43f72d14ad52be6f911d398f527d05a0cf (patch) | |
| tree | 08b1ea4bfd8a82d0dd1a7f2fd9c53a0bb1aa66e9 | |
| parent | d91e3beaa308e32f7d8c31daa1402f30816fb447 (diff) | |
| download | php-git-882dcb43f72d14ad52be6f911d398f527d05a0cf.tar.gz | |
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.
| -rw-r--r-- | ext/pcre/config0.m4 | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 77ab9f5c60..cfacd6ca8e 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -68,20 +68,18 @@ else AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) AC_DEFINE(PCRE2_CODE_UNIT_WIDTH, 8, [ ]) - if test "$PHP_PCRE_REGEX" != "no"; then - AC_MSG_CHECKING([whether to enable PCRE JIT functionality]) - if test "$PHP_PCRE_JIT" != "no"; then - AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, [ ]) - AC_MSG_RESULT([yes]) - else + AC_MSG_CHECKING([whether to enable PCRE JIT functionality]) + if test "$PHP_PCRE_JIT" != "no"; then + AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, [ ]) + AC_MSG_RESULT([yes]) + else AC_MSG_RESULT([no]) - fi fi fi PHP_ARG_WITH(pcre-valgrind,,[ --with-pcre-valgrind=DIR Enable PCRE valgrind support. Developers only!], no, no) - if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then + if test "$PHP_EXTERNAL_PCRE" != "no"; then AC_MSG_WARN([PHP is going to be linked with an external PCRE, --with-pcre-valgrind has no effect]) else if test "$PHP_PCRE_VALGRIND" != "no"; then |