From c3a1cc382a3cdeac8009c4dc9c184a7a3517bd32 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 29 Sep 2017 12:16:47 +0200 Subject: [PATCH] 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. --- ext/pcre/config0.m4 | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index cc9f1b262a..6d5b257791 100644 --- 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 -- 2.40.0