]> granicus.if.org Git - php/commitdiff
fix default args for --with-pcre-valgrind
authorAnatol Belski <ab@php.net>
Thu, 13 Jul 2017 18:28:10 +0000 (20:28 +0200)
committerAnatol Belski <ab@php.net>
Thu, 13 Jul 2017 18:28:10 +0000 (20:28 +0200)
ext/pcre/config0.m4

index aa8cd304e09683eb0a6694460242aa628d549a6c..cc9f1b262ae30ef1e16795bbb2738a6952a8b1f4 100644 (file)
@@ -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