Skip to content

Commit c3a1cc3

Browse files
committed
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 24de0fe. Revert "Enable valgrind support for PCRE by default in debug builds" This reverts commit 850bb99.
1 parent d3aa652 commit c3a1cc3

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

ext/pcre/config0.m4

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,12 @@ PHP_ARG_WITH(pcre-jit,,[ --with-pcre-jit Enable PCRE JIT functionality]
7878
fi
7979
fi
8080

81-
if test "$PHP_DEBUG" != "no" && test "$PHP_DEBUG" != "0"; then
82-
PHP_ARG_WITH(pcre-valgrind,,[ --with-pcre-valgrind=DIR
83-
Enable PCRE valgrind support. Developers only!], yes, no)
84-
else
85-
PHP_ARG_WITH(pcre-valgrind,,[ --with-pcre-valgrind=DIR
86-
Enable PCRE valgrind support. Developers only!], no, no)
87-
fi
88-
81+
PHP_ARG_WITH(pcre-valgrind,,[ --with-pcre-valgrind=DIR
82+
Enable PCRE valgrind support. Developers only!], no, no)
8983
if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
9084
AC_MSG_WARN([PHP is going to be linked with an external PCRE, --with-pcre-valgrind has no effect])
9185
else
92-
if test "$PHP_PCRE_VALGRIND" = "no" && test "$PHP_DEBUG" != "0"; then
93-
AC_MSG_NOTICE([PCRE Valgrind support is disabled for debug build])
94-
elif test "$PHP_PCRE_VALGRIND" != "no" || test "$PHP_DEBUG" != "0"; then
86+
if test "$PHP_PCRE_VALGRIND" != "no"; then
9587
PHP_PCRE_VALGRIND_INCDIR=
9688
AC_MSG_CHECKING([for Valgrind headers location])
9789
for i in $PHP_PCRE_VALGRIND $PHP_PCRE_VALGRIND/include $PHP_PCRE_VALGRIND/local/include /usr/include /usr/local/include; do

0 commit comments

Comments
 (0)