com php-src: fix default args for --with-pcre-valgrind: ext/pcre/config0.m4

Commit: 24de0fe9f4f92178adba27e2f1353e97a956b4a8 Author: Anatol Belski <ab@php.net> Thu, 13 Jul 2017 20:28:10 +0200 Parents: 850bb998d9664e849ed743ea031dd0ee2a64cc9d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=24de0fe9f4f92178adba27e2f1353e97a956b4a8 Log: fix default args for --with-pcre-valgrind Changed paths: M ext/pcre/config0.m4 Diff: diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index aa8cd30..cc9f1b2 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -78,15 +78,20 @@ PHP_ARG_WITH(pcre-jit,,[ --with-pcre-jit Enable PCRE JIT functionality] fi fi -PHP_ARG_WITH(pcre-valgrind,,[ --with-pcre-valgrind=DIR - Enable PCRE valgrind support. Developers only!], $PHP_DEBUG, no) + 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 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" != "no"; then + 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" != "no"; then + elif test "$PHP_PCRE_VALGRIND" != "no" || test "$PHP_DEBUG" != "0"; 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