From: Joe Watkins <krakjoe@php.net>
Date: Thu, 28 Mar 2019 06:35:33 +0000 (+0100)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha1~656
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=330517987bb40b8674861e11dc3eed689b31198c;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  fix build: readline support must be disabled by default in phpdbg
---

330517987bb40b8674861e11dc3eed689b31198c
diff --cc sapi/phpdbg/config.m4
index 9abc990224,24bc557c8b..f590dc6196
--- a/sapi/phpdbg/config.m4
+++ b/sapi/phpdbg/config.m4
@@@ -1,27 -1,17 +1,27 @@@
  dnl config.m4 for sapi phpdbg
  
 -PHP_ARG_ENABLE(phpdbg, for phpdbg support,
 -[  --enable-phpdbg         Build phpdbg], yes, yes)
 -
 -PHP_ARG_ENABLE(phpdbg-webhelper, for phpdbg web SAPI support,
 -[  --enable-phpdbg-webhelper
 -                          Build phpdbg web SAPI support], no)
 -
 -PHP_ARG_ENABLE(phpdbg-debug, for phpdbg debug build,
 -[  --enable-phpdbg-debug   Build phpdbg in debug mode], no, no)
 +PHP_ARG_ENABLE([phpdbg],
 +  [for phpdbg support],
 +  [AS_HELP_STRING([--enable-phpdbg],
 +    [Build phpdbg])],
 +  [yes],
 +  [yes])
 +
 +PHP_ARG_ENABLE([phpdbg-webhelper],
 +  [for phpdbg web SAPI support],
 +  [AS_HELP_STRING([--enable-phpdbg-webhelper],
 +    [Build phpdbg web SAPI support])],
 +  [no])
 +
 +PHP_ARG_ENABLE([phpdbg-debug],
 +  [for phpdbg debug build],
 +  [AS_HELP_STRING([--enable-phpdbg-debug],
 +    [Build phpdbg in debug mode])],
 +  [no],
 +  [no])
  
  PHP_ARG_ENABLE(phpdbg-readline, for phpdbg readline support,
- [  --enable-phpdbg-readline   Enable readline support in phpdbg (depends on static ext/readline)], yes, yes)
+ [  --enable-phpdbg-readline   Enable readline support in phpdbg (depends on static ext/readline)], no, no)
  
  if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then
    AC_HEADER_TIOCGWINSZ