From: Joe Watkins <krakjoe@php.net>
Date: Thu, 28 Mar 2019 06:35:15 +0000 (+0100)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.5RC1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62a652a0d559f2d1db7e823e0c59e3bcd254af33;p=php

Merge branch 'PHP-7.2' into PHP-7.3

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

62a652a0d559f2d1db7e823e0c59e3bcd254af33
diff --cc sapi/phpdbg/config.m4
index 93144acb14,3cdd90495a..24bc557c8b
--- a/sapi/phpdbg/config.m4
+++ b/sapi/phpdbg/config.m4
@@@ -1,17 -1,18 +1,17 @@@
 -dnl
 -dnl $Id$
 -dnl
 +dnl config.m4 for sapi phpdbg
  
  PHP_ARG_ENABLE(phpdbg, for phpdbg support,
 -[  --enable-phpdbg            Build phpdbg], yes, yes)
 +[  --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)
 +[  --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)
 +[  --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