Revert --with-pcre-valgrind by default in debug build

After quite a few people reported this option enabled to be in many cases
not handy by default, it's reverted to no by default everywhere. If enabled,
it requires Valgrind dev packages, where just a few have Valgrind itself
installed or care. Still for PCRE related work this option is a must,
though will have to be turned on by hand.

Revert "fix default args for --with-pcre-valgrind"

This reverts commit 24de0fe9f4f92178adba27e2f1353e97a956b4a8.

Revert "Enable valgrind support for PCRE by default in debug builds"

This reverts commit 850bb998d9664e849ed743ea031dd0ee2a64cc9d.

diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index cc9f1b262ae30ef1e16795bbb2738a6952a8b1f4..6d5b2577911666d9fa2ad0c0563b16c6ec9fb4ed 100644 (file)
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -78,20 +78,12 @@ PHP_ARG_WITH(pcre-jit,,[  --with-pcre-jit         Enable PCRE JIT functionality]
     fi
   fi
 
-  if test "$PHP_DEBUG" != "no" && test "$PHP_DEBUG" != "0"; then
-    PHP_ARG_WITH(pcre-valgrind,,[  --with-pcre-valgrind=DIR
-                          Enable PCRE valgrind support. Developers only!], yes, no)
-  else
-    PHP_ARG_WITH(pcre-valgrind,,[  --with-pcre-valgrind=DIR
-                           Enable PCRE valgrind support. Developers only!], no, no)
-  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
     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" && test "$PHP_DEBUG" != "0"; then
-      AC_MSG_NOTICE([PCRE Valgrind support is disabled for debug build])
-    elif test "$PHP_PCRE_VALGRIND" != "no" || test "$PHP_DEBUG" != "0"; then
+    if test "$PHP_PCRE_VALGRIND" != "no"; then
       PHP_PCRE_VALGRIND_INCDIR=
       AC_MSG_CHECKING([for Valgrind headers location])
       for i in $PHP_PCRE_VALGRIND $PHP_PCRE_VALGRIND/include $PHP_PCRE_VALGRIND/local/include /usr/include /usr/local/include; do