From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 1 Feb 2019 10:41:18 +0000 (+0100)
Subject: Fix bogus $PHP_PCRE_REGEX checks
X-Git-Tag: php-7.4.0alpha1~1137
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=882dcb43f72d14ad52be6f911d398f527d05a0cf;p=php

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.
---

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